Skip to content

Commit 7efbb9d

Browse files
changes to make docker push internal (#1636)
Co-authored-by: Suvarna Rokade <[email protected]>
1 parent 8bec600 commit 7efbb9d

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

.github/workflows/gobuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ jobs:
8282
- name: Run scan
8383
run: |
8484
image_tag=$(<dockerhub-image-label.txt)
85-
docker run -e JKN_USERNAME=${{ secrets.JKN_USERNAME }} -e JKN_PASSWORD=${{ secrets.JKN_PASSWORD }} -t docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:latest jobs execute-job --credential-mode env -n teams-deleng-terraform -p deleng-terraform/dockerhub-publish -d "{\"APPID\":\"test\", \"IMAGE\":\"docker-terrascan-local.artifactory.eng.tenable.com/terrascan:${image_tag}\", \"TARGETS\": \"tenable/terrascan:${image_tag},"tenable/terrascan:latest\", \"MULTIARCH\":\"true\"}" --cloudflare-access-secret ${{ secrets.CF_ACCESS_TOKEN }}:${{ secrets.CF_SECRET }}
85+
docker run -e JKN_USERNAME=${{ secrets.JKN_USERNAME }} -e JKN_PASSWORD=${{ secrets.JKN_PASSWORD }} -t docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:latest jobs execute-job --credential-mode env -n teams-deleng-terraform -p deleng-terraform/dockerhub-publish -d "{\"APPID\":\"test\", \"IMAGE\":\"docker-terrascan-local.artifactory.eng.tenable.com/terrascan:${image_tag}\", \"TARGETS\": \"tenable/terrascan:${image_tag},tenable/terrascan:latest\", \"MULTIARCH\":\"true\"}" --cloudflare-access-secret ${{ secrets.CF_ACCESS_TOKEN }}:${{ secrets.CF_SECRET }}

.github/workflows/release.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,26 @@ jobs:
3838

3939
- uses: docker/setup-qemu-action@v2
4040

41-
- name: Login to Docker Hub
42-
uses: docker/login-action@v2
43-
with:
44-
username: ${{ secrets.DOCKERHUB_USERNAME }}
45-
password: ${{ secrets.DOCKERHUB_TOKEN }}
41+
- name: Login to Artifactory
42+
run: docker login --username svc_terrascan --password ${{ secrets.ARTIFACTORY_API_TOKEN }} https://docker-terrascan-local.artifactory.eng.tenable.com
4643

47-
- name: Build and Push Terrascan latest tag docker image
44+
- name: Build Terrascan latest tag docker image
4845
run: make docker-build-push-latest-tag
4946
env:
5047
MULTIPLATFORM: true
5148

49+
- name: Pull latest Image
50+
run: docker pull docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:latest
51+
52+
- name: Run scan on terrascan image
53+
run: |
54+
image_tag=$(<dockerhub-image-label.txt)
55+
docker run -e JKN_USERNAME=${{ secrets.JKN_USERNAME }} -e JKN_PASSWORD=${{ secrets.JKN_PASSWORD }} -t docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:latest jobs execute-job --credential-mode env -n teams-deleng-terraform -p deleng-terraform/dockerhub-publish -d "{\"APPID\":\"test\", \"IMAGE\":\"docker-terrascan-local.artifactory.eng.tenable.com/terrascan:${image_tag}\", \"TARGETS\": \"tenable/terrascan:${image_tag},tenable/terrascan:latest\", \"MULTIARCH\":\"true\"}" --cloudflare-access-secret ${{ secrets.CF_ACCESS_TOKEN }}:${{ secrets.CF_SECRET }}
56+
5257
- name: Build terrascan_atlantis docker image
5358
run: make atlantis-docker-build
5459

55-
- name: Push terrascan_atlantis latest tag docker image
56-
run: make atlantis-docker-push-latest-tag
60+
- name: Run scan on terrascan_atlantis image
61+
run: |
62+
image_tag=$(<dockerhub-image-label.txt)
63+
docker run -e JKN_USERNAME=${{ secrets.JKN_USERNAME }} -e JKN_PASSWORD=${{ secrets.JKN_PASSWORD }} -t docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:latest jobs execute-job --credential-mode env -n teams-deleng-terraform -p deleng-terraform/dockerhub-publish -d "{\"APPID\":\"test\", \"IMAGE\":\"docker-terrascan-local.artifactory.eng.tenable.com/terrascan_atlantis:${image_tag}\", \"TARGETS\": \"tenable/terrascan_atlantis:${image_tag}\", \"MULTIARCH\":\"true\"}" --cloudflare-access-secret ${{ secrets.CF_ACCESS_TOKEN }}:${{ secrets.CF_SECRET }}

scripts/atlantis/docker-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -o nounset
55
set -o pipefail
66

77
GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
8-
DOCKER_REPO="tenable/terrascan_atlantis"
8+
DOCKER_REPO="docker-terrascan-local.artifactory.eng.tenable.com/terrascan_atlantis"
99
DIR="./integrations/atlantis"
1010

1111
docker build -t ${DOCKER_REPO}:${GIT_COMMIT} ${DIR}

scripts/atlantis/docker-push-latest-tag.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -o nounset
55
set -o pipefail
66

77
GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
8-
DOCKER_REPO="tenable/terrascan_atlantis"
8+
DOCKER_REPO="docker-terrascan-local.artifactory.eng.tenable.com/terrascan_atlantis"
99
LATEST_TAG=$(git describe --abbrev=0 --tags)
1010
LATEST_TAG_SHORT=$(echo "${LATEST_TAG//v}")
1111

scripts/atlantis/docker-push-latest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -o nounset
55
set -o pipefail
66

77
GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
8-
DOCKER_REPO="tenable/terrascan_atlantis"
8+
DOCKER_REPO="docker-terrascan-local.artifactory.eng.tenable.com/terrascan_atlantis"
99
LATEST_TAG="latest"
1010

1111
# PS: It is a prerequisite to execute 'docker login' before running this script

0 commit comments

Comments
 (0)