test

tenable · Oct 23, 2023 · 74e697f · 74e697f
1 parent 4932fd7
commit 74e697f
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/.github/workflows/gobuild.yml b/.github/workflows/gobuild.yml
@@ -31,19 +31,6 @@ jobs:
           ls
           cat test.txt
 
-      - name: Login to Artifactory
-        run: docker login --username svc_terrascan --password ${{ secrets.ARTIFACTORY_API_TOKEN }}  https://docker-terrascan-local.artifactory.eng.tenable.com
-
-      - name: Pull Image
-        run:  docker pull docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:1.0.10.DEV231011191849-J-EPRT-TENB-CB-TENB-CB-CICD-5797-10
-
-      - name: Run scan
-        run: |
-          image_tag=$(<test.txt)
-          echo $image_tag
-          echo "{\"APPID\":\"test\", \"IMAGE\":\"docker-terrascan-local.artifactory.eng.tenable.com/terrascan:${image_tag}\" \"TARGETS\": \"tenable/terrascan:${image_tag},tenable/was-scanner:latest\", \"MULTIARCH\":\"true\"}"
-          docker run -e JKN_USERNAME=${{ secrets.JKN_USERNAME }} -e JKN_PASSWORD=${{ secrets.JKN_PASSWORD }} -t docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:1.0.10.DEV231011191849-J-EPRT-TENB-CB-TENB-CB-CICD-5797-10 jobs execute-job  --credential-mode env -n teams-deleng-terraform -p deleng-terraform/Scratch/dockerhub-tester -d '{"APPID":"test"}' --cloudflare-access-secret ${{ secrets.CF_ACCESS_TOKEN }}:${{ secrets.CF_SECRET }}
-
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
@@ -95,9 +82,16 @@ jobs:
         run: make docker-build-push-latest
         env:
           MULTIPLATFORM: true
-
-      - name: Read File and Set as Variable
-        id: read-file
+
+      - name: Login to Artifactory
+        run: docker login --username svc_terrascan --password ${{ secrets.ARTIFACTORY_API_TOKEN }}  https://docker-terrascan-local.artifactory.eng.tenable.com
+
+      - name: Pull Image
+        run:  docker pull docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:1.0.10.DEV231011191849-J-EPRT-TENB-CB-TENB-CB-CICD-5797-10
+
+      - name: Run scan
         run: |
-          file_content=$(<dockerhub-image-label.txt)
-          echo "::set-output name=file_content::$file_content"
+          image_tag=$(<dockerhub-image-label.txt)
+          echo $image_tag
+          echo "{\"APPID\":\"test\", \"IMAGE\":\"docker-terrascan-local.artifactory.eng.tenable.com/terrascan:${image_tag}\" \"TARGETS\": \"tenable/terrascan:${image_tag},tenable/was-scanner:latest\", \"MULTIARCH\":\"true\"}"
+          docker run -e JKN_USERNAME=${{ secrets.JKN_USERNAME }} -e JKN_PASSWORD=${{ secrets.JKN_PASSWORD }} -t docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:1.0.10.DEV231011191849-J-EPRT-TENB-CB-TENB-CB-CICD-5797-10 jobs execute-job  --credential-mode env -n teams-deleng-terraform -p deleng-terraform/Scratch/dockerhub-tester -d "{\"APPID\":\"test\", \"IMAGE\":\"docker-terrascan-local.artifactory.eng.tenable.com/terrascan:${image_tag}\" \"TARGETS\": \"tenable/terrascan:${image_tag},tenable/was-scanner:latest\", \"MULTIARCH\":\"true\"}" --cloudflare-access-secret ${{ secrets.CF_ACCESS_TOKEN }}:${{ secrets.CF_SECRET }}