mirror of
https://github.com/sourcegraph/sourcegraph.git
synced 2026-02-06 15:12:02 +00:00
This PR ships our freshly rewritten container images built with rules_oci and Wolfi, which for now will only be used on S2. *What is this about* This work is the conjunction of [hardening container images](https://github.com/orgs/sourcegraph/projects/302?pane=issue&itemId=25019223) and fully building our container images with Bazel. * All base images are now distroless, based on Wolfi, meaning we fully control every little package version and we won't be subject anymore to Alpine maintainers dropping a postgres version for example. * Container images are now built with `rules_oci`, meaning we don't have Dockerfile anymore, but instead created through [Bazel rules](https://sourcegraph.sourcegraph.com/github.com/sourcegraph/sourcegraph@bzl/oci_wolfi/-/blob/enterprise/cmd/gitserver/BUILD.bazel). Don't be scared, while this will look a bit strange to you at first, it's much saner and simpler to do than our Dockerfiles and their muddy shell scripts calling themselves in cascade. :spiral_note_pad: *Plan*: *1/ (NOW) We merge our branch on `main` today, here is what it does change for you 👇:skin-tone-3::* * On `main`: * It will introduce a new job on `main` _Bazel Push_, which will push those new images on our registries with all tags prefixed by `bazel-`. * These new images will be picked up by S2 and S2 only. * The existing jobs building docker images and pushing them will stay in place until we have QA'ed them enough and are confident to roll them out on Dotcom. * Because we'll be building both images, there will be more jobs running on `main`, but this should not affect the wall clock time. * On all branches (so your PRs and `main`) * The _Bazel Test_ job will now run: Backend Integration Tests, E2E Tests and CodeIntel QA * This will increase the duration of your test jobs in PRs, but as we haven't removed yet the `sg lint` step, it should not affect too much the wall clock time of your PRs. * But it will also increase your confidence toward your changes, as the coverage will vastly increased compared to before. * If you have ongoing branches which are affecting the docker images (like adding a new binary, like the recent `scip-tags`, reach us out on #job-fair-bazel so we can help you to port your changes. It's much much simpler than before, but it's going to be unfamiliar to you). * If something goes awfully wrong, we'll rollback and update this thread. *2/ (EOW / Early next week) Once we're confident enough with what we saw on S2, we'll roll the new images on Dotcom.* * After the first successful deploy and a few sanity checks, we will drop the old images building jobs. * At this point, we'll reach out to all TLs asking for their help to exercise all features of our product to ensure we catch any potential breakage. ## Test plan <!-- All pull requests REQUIRE a test plan: https://docs.sourcegraph.com/dev/background-information/testing_principles --> * We tested our new images on `scale-testing` and it worked. * The new container building rules comes with _container tests_ which ensures that produced images are containing and configured with what should be in there: [example](https://sourcegraph.sourcegraph.com/github.com/sourcegraph/sourcegraph@bzl/oci_wolfi/-/blob/enterprise/cmd/gitserver/image_test.yaml) . --------- Co-authored-by: Dave Try <davetry@gmail.com> Co-authored-by: Will Dollman <will.dollman@sourcegraph.com>
87 lines
2.1 KiB
Go
87 lines
2.1 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"os"
|
|
"sort"
|
|
"time"
|
|
|
|
"github.com/sourcegraph/sourcegraph/dev/codeintel-qa/internal"
|
|
)
|
|
|
|
var (
|
|
indexDir string
|
|
numConcurrentUploads int
|
|
verbose bool
|
|
pollInterval time.Duration
|
|
timeout time.Duration
|
|
srcPath string
|
|
|
|
start = time.Now()
|
|
)
|
|
|
|
func init() {
|
|
// Default assumes running from the dev/codeintel-qa directory
|
|
flag.StringVar(&indexDir, "index-dir", "./testdata/indexes", "The location of the testdata directory")
|
|
flag.IntVar(&numConcurrentUploads, "num-concurrent-uploads", 5, "The maximum number of concurrent uploads")
|
|
flag.BoolVar(&verbose, "verbose", false, "Display full state from graphql")
|
|
flag.DurationVar(&pollInterval, "poll-interval", time.Second*5, "The time to wait between graphql requests")
|
|
flag.DurationVar(&timeout, "timeout", 0, "The time it should take to upload and process all targets")
|
|
flag.StringVar(&srcPath, "src-path", "src", "Path to src-cli binary")
|
|
}
|
|
|
|
func main() {
|
|
if err := flag.CommandLine.Parse(os.Args[1:]); err != nil {
|
|
fmt.Fprintf(os.Stderr, "error: %s\n", err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
ctx := context.Background()
|
|
if timeout > 0 {
|
|
var cancel context.CancelFunc
|
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
|
defer cancel()
|
|
}
|
|
|
|
if err := mainErr(ctx); err != nil {
|
|
fmt.Printf("%s error: %s\n", internal.EmojiFailure, err.Error())
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
|
|
func mainErr(ctx context.Context) error {
|
|
if err := internal.InitializeGraphQLClient(); err != nil {
|
|
return err
|
|
}
|
|
|
|
extensionAndCommitsByRepo, err := internal.ExtensionAndCommitsByRepo(indexDir)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
repoNames := make([]string, 0, len(extensionAndCommitsByRepo))
|
|
for name := range extensionAndCommitsByRepo {
|
|
repoNames = append(repoNames, name)
|
|
}
|
|
sort.Strings(repoNames)
|
|
|
|
limiter := internal.NewLimiter(numConcurrentUploads)
|
|
defer limiter.Close()
|
|
|
|
uploads, err := uploadAll(ctx, extensionAndCommitsByRepo, limiter)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
sort.Slice(uploads, func(i, j int) bool {
|
|
return uploads[i].id < uploads[j].id
|
|
})
|
|
|
|
if err := monitor(ctx, repoNames, uploads); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|