Skip to content

Commit a2115d7

Browse files
authored
Merge pull request #1580 from snyk/staging
RELEASE
2 parents 9e65667 + 3c44b77 commit a2115d7

12 files changed

+325
-473
lines changed

.circleci/config.yml

Lines changed: 323 additions & 280 deletions
Large diffs are not rendered by default.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN go install github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/doc
88
RUN --mount=type=secret,id=gh_token,required=true \
99
git config --global url."https://$(cat /run/secrets/gh_token):[email protected]/snyk".insteadOf "https://github.com/snyk" && \
1010
go env -w GOPRIVATE=github.com/snyk && \
11-
go install github.com/snyk/docker-credential-acr-env@697fe895979cea8a1595b4c0c30ea78a5f5c13ce && \
11+
go install github.com/snyk/docker-credential-acr-env@62fbee8398a22171cb0f628400a29b2ebaed7a3a && \
1212
git config --global --unset url."https://$(cat /run/secrets/gh_token):[email protected]/snyk".insteadOf
1313

1414
#---------------------------------------------------------------------

Dockerfile.ubi9

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN GOTOOLCHAIN=go1.23.4 go install github.com/awslabs/amazon-ecr-credential-hel
77
RUN --mount=type=secret,id=gh_token,uid=1001,required=true \
88
git config --global url."https://$(cat /run/secrets/gh_token):[email protected]/snyk".insteadOf "https://github.com/snyk" && \
99
go env -w GOPRIVATE=github.com/snyk && \
10-
GOTOOLCHAIN=go1.23.4 go install github.com/snyk/docker-credential-acr-env@697fe895979cea8a1595b4c0c30ea78a5f5c13ce && \
10+
GOTOOLCHAIN=go1.23.4 go install github.com/snyk/docker-credential-acr-env@62fbee8398a22171cb0f628400a29b2ebaed7a3a && \
1111
git config --global --unset url."https://$(cat /run/secrets/gh_token):[email protected]/snyk".insteadOf
1212

1313
#---------------------------------------------------------------------

scripts/circleci-jobs/setup-integration-tests.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

scripts/docker/approve-image.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,18 @@ set -e
66
# then it would be null
77
if [ $1 == "null" ]; then
88
echo Semantic-Release did not create a new version, not pushing a new approved image
9-
./scripts/slack/notify_success_no_release.py
109
else
1110
IMAGE_NAME_CANDIDATE=snyk/kubernetes-monitor:staging-candidate-${CIRCLE_SHA1}
1211
IMAGE_NAME_APPROVED=snyk/kubernetes-monitor:${1}-approved
1312

1413
docker pull ${IMAGE_NAME_CANDIDATE}
1514
docker tag ${IMAGE_NAME_CANDIDATE} ${IMAGE_NAME_APPROVED}
1615
docker push ${IMAGE_NAME_APPROVED}
17-
./scripts/slack/notify_push.py ${IMAGE_NAME_APPROVED}
1816

1917
IMAGE_NAME_CANDIDATE_UBI9=snyk/kubernetes-monitor:staging-candidate-ubi9-${CIRCLE_SHA1:0:8}
2018
IMAGE_NAME_APPROVED_UBI9=snyk/kubernetes-monitor:${1}-ubi9-approved
2119

2220
docker pull ${IMAGE_NAME_CANDIDATE_UBI9}
2321
docker tag ${IMAGE_NAME_CANDIDATE_UBI9} ${IMAGE_NAME_APPROVED_UBI9}
2422
docker push ${IMAGE_NAME_APPROVED_UBI9}
25-
./scripts/slack/notify_push.py ${IMAGE_NAME_APPROVED_UBI9}
2623
fi

scripts/publish-gh-pages.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ git checkout -f gh-pages
1515
if grep -Fxq " tag: ${NEW_TAG}" ./snyk-monitor/values.yaml
1616
then
1717
echo not publishing a new gh-pages commit since this version is already published
18-
./scripts/slack/notify_success_no_publish.py
1918
exit 0
2019
fi
2120

@@ -59,5 +58,3 @@ for (( i=0; i<${attempts}; i++ )); do
5958
echo "$curl_response"
6059
sleep $sleep_time
6160
done
62-
63-
./scripts/slack/notify_push.py "gh-pages"

scripts/slack/notify_deploy.py

Lines changed: 0 additions & 31 deletions
This file was deleted.

scripts/slack/notify_failure.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

scripts/slack/notify_failure_on_branch.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

scripts/slack/notify_push.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)