Build our own caddy image #61881
Merged
Build our own caddy image #61881
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The old setup resulted in a circular dep where if you added a new image, then to trigger an update you had to edit an existing lockfile. Ideally we'd only invalidate when a wolfi-images/*.lock.json file changes, but unsure if this is possible
willdollman
commented
Apr 15, 2024
wolfi-images/repo.bzl
Outdated
Comment on lines
43
to
45
| # Used to invalidate this repository when any lockfiles change. | ||
| rctx.path(rctx.path("wolfi-images")) | ||
|
|
There was a problem hiding this comment.
@Strum355 this works in some basic testing but not sure if there's a cleaner way to handle this. The issue I ran into was after adding the caddy image's yaml and lock.json files, the new lockfile wasn't in the dependency list -> repo wasn't invalidated -> repo isn't added to list -> GOTO 1.
There was a problem hiding this comment.
You can use rctx.watch("wolfi-images") for this now that we're on bazel 7.1
There was a problem hiding this comment.
Actually, youll want rctx.watch_tree given this is a directory
|
Tested the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We currently just retag the upstream Caddy image where we use it in deploy-sourcegraph-docker. The upstream is slow to patch go module vulns, and the update process is different to the rest of our images.
Build a caddy container from scratch here to avoid having a separate update process, and to make use of the latest patched version of caddy from the wolfi repo.
Example of creating a new container image
This PR is also a good example of creating a new container image that uses a customised base image. The steps to create this PR were:
wolfi-images/caddy.yamlsg wolfi lock caddyto generate thewolfi-images/caddy.lock.jsonlockfiledocker-images/caddy/BUILD.bazel) to build the full Caddy image using the base image configurationsg wolfi image caddyorbazel run //docker-images/caddy:base_tarballdocker-images/caddy/image_test.yaml)bazel run //docker-images/caddy:image_testTest plan