Skip to content

Commit 41b0e82

Browse files
authored
Merge pull request #410 from snyk/fix/gar-stigs-migration
fix: move to gar/stigs images
2 parents 51c54fc + b91068a commit 41b0e82

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

.circleci/config.yml

+2-9
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@ only_tags_filter: &only_tags_filter
4040
ignore: /.*/
4141

4242
commands:
43-
gcr_auth:
44-
description: Auth GCR
45-
steps:
46-
- setup_remote_docker
47-
- run:
48-
name: GCR auth
49-
command: echo $GCLOUD_GCR_BUILDER | docker login -u _json_key --password-stdin https://gcr.io/snyk-main
50-
5143
setup_build_remote_docker:
5244
steps:
5345
- setup_remote_docker:
@@ -90,7 +82,8 @@ jobs:
9082
steps:
9183
- checkout:
9284
path: ~/vervet
93-
- gcr_auth
85+
- setup_build_remote_docker
86+
- publish/auth-build
9487
- run:
9588
name: Build Docker Image
9689
command: make build-docker APP=vervet-underground

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
3131
# we're not changing anything, only making it explicit.
3232
# Thanks to emulation, this will also run on ARM Macs.
3333
# Advised to move from distroless to the secure base image - https://docs.google.com/document/d/1I-vxsuHlmBlM8JHSDpvOmVMGeQQcbPgb8jH1ELEE9wo/edit#heading=h.1xke9mez8zov
34-
FROM --platform=amd64 gcr.io/snyk-main/ubuntu-20:2.4.0_202501141014
34+
FROM --platform=amd64 us-docker.pkg.dev/polaris-gcp-gar/polaris/ubuntu-20-golang-1-cis-stig-fips:3.3.0_202503041258
3535

3636
COPY config.*.json /
3737
COPY --from=builder /go/bin/app /

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ lint-docker:
4646
build-docker:
4747
docker build \
4848
-t ${APP}:${CIRCLE_WORKFLOW_ID} \
49-
-t gcr.io/snyk-main/${APP}:${CIRCLE_SHA1} .
49+
-t us-docker.pkg.dev/polaris-gcp-gar/polaris/${APP}:${CIRCLE_SHA1} .
5050

5151
#----------------------------------------------------------------------------------
5252
# Ignores the test cache and forces a full test suite execution

0 commit comments

Comments
 (0)