Skip to content

Commit

Permalink
Merge pull request #1530 from snyk/staging
Browse files Browse the repository at this point in the history
RELEASE
  • Loading branch information
kat1906 authored Oct 9, 2024
2 parents 05db96b + 12d4b46 commit 08f7c90
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apk update
RUN apk upgrade
RUN apk --no-cache add git

RUN go install github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login@69c85dc22db6511932bbf119e1a0cc5c90c69a7f
RUN go install github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login@bef5bd9384b752e5c645659165746d5af23a098a
RUN go install github.com/chrismellard/docker-credential-acr-env@82a0ddb2758901b711d9d1614755b77e401598a1

#---------------------------------------------------------------------
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.ubi9
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ ARG DUMB_INIT_BINARY_FILE_SHASUM256=e874b55f3279ca41415d290c512a7ba9d08f98041b28
ARG SKOPEO_VERSION=1.13.2
ARG SKOPEO_BINARY_FILE_SHASUM256=2f00be6ee1c4cbfa7f2452be90a1a2ce88fd92a6d0f6a2e9d901bd2087bd9092
# https://github.com/awslabs/amazon-ecr-credential-helper/releases
ARG ECR_CREDENTIAL_HELPER_VERSION=0.7.1
ARG ECR_CREDENTIAL_HELPER_BINARY_FILE_SHASUM256=a82cc3ed2cf959616212e3c3c3893dda4f7886da1447c444ef541e6f595ae087
# for sha: download SHA256 for the linux-amd64/docker-credential-ecr-login, then `cat docker-credential-ecr-login.sha256`
ARG ECR_CREDENTIAL_HELPER_VERSION=0.9.0
ARG ECR_CREDENTIAL_HELPER_BINARY_FILE_SHASUM256=dd6bd933e439ddb33b9f005ad5575705a243d4e1e3d286b6c82928bcb70e949a
# since this is built from a commit, you will need to build it locally to get the sha
ARG ACR_CREDENTIAL_HELPER_BINARY_SHASUM256=598bbd4ad2741ae2e68ac55e938a4542e71952e418e6278a74baf6213ef8ce76

LABEL name="Snyk Controller" \
Expand Down
2 changes: 1 addition & 1 deletion scripts/circleci-jobs/prepare_to_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ workers:
metadata:
annotations:
github.com/project-slug: snyk/kubernetes-monitor
github.com/team-slug: snyk/orchestration-integrations
github.com/team-slug: snyk/test-enrichment
labels:
$SNYK_OWNER_LABEL_KEY: $SNYK_OWNER_LABEL_VALUE
$SNYK_LOG_DEST_LABEL_KEY: $SNYK_LOG_DEST_LABEL_VALUE
Expand Down

0 comments on commit 08f7c90

Please sign in to comment.