Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build 3rd party Wolfi images #47368

Merged
merged 47 commits into from Apr 20, 2023
Merged

Build 3rd party Wolfi images #47368

merged 47 commits into from Apr 20, 2023

Conversation

willdollman
Copy link
Contributor

@willdollman willdollman commented Feb 3, 2023 •
edited

This PR migrates our 3rd party docker images from docker-images/ to Wolfi.

The counterpart to this is #47182 which tracks our 1st party images in cmd/.

There are 19 images to migrate here - many need custom base images and dependencies packaged:

  • blobstore
  • cadvisor
  • codeinsights-db
  • codeintel-db
  • indexed-searcher
  • jaeger-agent
  • jaeger-all-in-one
  • node-exporter
  • opentelemetry-collector
  • postgres-12-alpine
  • postgres_exporter
  • prometheus-gcp - not migrating yet, as it uses an older version of prometheus
  • prometheus
  • redis-cache
  • redis-store
  • redis_exporter
  • search-indexer
  • sg
  • syntax-highlighter

Test plan

  • Manual testing of images
    • Container structure tests in the future

@cla-bot cla-bot bot added the cla-signed label Feb 3, 2023
@willdollman willdollman changed the base branch from main to wolfi/build-wolfi February 3, 2023 10:50
@willdollman willdollman force-pushed the wolfi/build-3rd-party-images branch 2 times, most recently from a3a4b2f to 503db97 Compare February 3, 2023 16:06
@willdollman
Add rough, untested cadvisor wolfi build
32dfab9
@willdollman
Fix cadvisor description
569c788
@willdollman
Package redis_exporter
9d1d130
@willdollman
Add wolfi-based redis_exporter image
78cbf69
@willdollman
Update cadvisor base image to dev build
aa1eaaa
@willdollman
Add more 3rd party images to build pipeline
6a1bb03
@willdollman
Add redis-exporter base config
1a6ad7e
@willdollman
Package opentelemetry-collector + build base image
9c3a465
@willdollman
Ignore files that don't match regex rather than dying
bd39c27
@willdollman
Add wolfi opentelemetry-collector image
adc8c31
@willdollman
Build opentelemetry-collector image in CI
01c03bc
@willdollman
Build wolfi sg docker image
0293d7b
@willdollman
Add Wolfi builds for indexed-search and search-indexer
afa2bf7 
This isn't the ideal solution for building these images -
see sourcegraph/security#570 (comment) for alternatives
@willdollman
Add indexed-search and search-indexer to CI pipeline
7749e47
@willdollman
Package jaeger
0e9056c
@willdollman
Build wolfi-based jaeger-agent
8e204ae
@willdollman
Add wolfi-based jaeger-all-in-one image
4995d3b
@willdollman
Tweak jaeger-agent base image comment
d0e410a
@willdollman
Add postgres_exporter wolfi image
9e0d9d9 
This is an upgrade from v0.11 -> v0.12
@willdollman
Add missing non-enterprise worker wolfi builds
80177a5
@willdollman
Add sourcegraph user to sourcegraph-dev base image
beb44e2
@willdollman
Tweak postgres-exporter version pin
99acedd
@willdollman
Remove unnecessary image labels
6e5546f 
These labels are added in the wolfi base image
@willdollman willdollman marked this pull request as ready for review April 20, 2023 10:06
@willdollman willdollman merged this pull request into wolfi/build-wolfi Apr 20, 2023
6 of 7 checks passed
@willdollman willdollman deleted the wolfi/build-3rd-party-images branch April 20, 2023 10:08
@sourcegraph-bot
Copy link
Contributor

Codenotify: Notifying subscribers in CODENOTIFY files for diff aa369c9...6e5546f.

Notify File(s)
@bobheadxi docker-images/cadvisor/Dockerfile.wolfi
docker-images/cadvisor/build-wolfi.sh
docker-images/prometheus/Dockerfile.wolfi
docker-images/prometheus/build-wolfi.sh
enterprise/dev/ci/internal/ci/pipeline.go
enterprise/dev/ci/internal/ci/wolfi_operations.go
enterprise/dev/ci/scripts/wolfi/build-base-image.sh
@efritz cmd/worker/Dockerfile.wolfi
cmd/worker/build-wolfi.sh
@sourcegraph/delivery docker-images/postgres-12-alpine/Dockerfile.wolfi
docker-images/postgres-12-alpine/build-wolfi.sh
docker-images/postgres-12-alpine/rootfs/postgres-wolfi.sh

@sourcegraph-bot
Copy link
Contributor

Codenotify: Notifying subscribers in OWNERS files for diff aa369c9...6e5546f.

Notify File(s)
@sourcegraph/dev-experience enterprise/dev/ci/internal/ci/pipeline.go
enterprise/dev/ci/internal/ci/wolfi_operations.go
enterprise/dev/ci/scripts/wolfi/build-base-image.sh

willdollman added a commit that referenced this pull request Apr 20, 2023
@willdollman
Build 3rd party Wolfi images (#47368)
a31e23a 
This PR migrates our 3rd party docker images from docker-images/ to
Wolfi.

#47182 tracks our 1st
party images in `cmd/`.

## Test plan

<!-- All pull requests REQUIRE a test plan:
https://docs.sourcegraph.com/dev/background-information/testing_principles
-->

- Manual testing
- These images will not be live once merged, and will undergo full validation before this happens.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
cla-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@willdollman @sourcegraph-bot