Update Docker (tenable#1242)

* updates docker hub location * updates docker image location * test docker push * docker push only from master
Rchanger · May 10, 2022 · beca33c · beca33c
1 parent 990dd2f
commit beca33c
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 19 deletions.
diff --git a/.github/workflows/gobuild.yml b/.github/workflows/gobuild.yml
@@ -69,10 +69,12 @@ jobs:
     - name: Build Terrascan docker image
       run: make docker-build
 
-    - name: Login to docker hub
-    #  login to docker hub only from master 
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
       if: ${{ github.ref == 'refs/heads/master' }}
-      run: echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u accurics --password-stdin
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Push Terrascan latest docker image
       if: ${{ github.ref == 'refs/heads/master' }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -42,8 +42,12 @@ jobs:
     - name: Build Terrascan docker image
       run: make docker-build
 
-    - name: Login to docker hub
-      run: echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u accurics --password-stdin
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      if: ${{ github.ref == 'refs/heads/master' }}
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Push Terrascan latest tag docker image
       run: make docker-push-latest-tag

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ Terrascan is a static code analyzer for Infrastructure as Code. Terrascan allows
     Join our community
 <br/>
 <a href="https://discord.gg/ScUPMzyG3n">
-    <img src="http://fig.io/icons/discord-logo-square.png" width="80px" height="80px" /> 
+    <img src="http://fig.io/icons/discord-logo-square.png" width="80px" height="80px" />
 </a>
 </p>
 
@@ -83,7 +83,7 @@ $ brew install terrascan
 Terrascan is also available as a Docker image and can be used as follows
 
 ```sh
-$ docker run accurics/terrascan
+$ docker run tenable/terrascan
 ```
 Refer to [documentation](https://runterrascan.io/docs/getting-started/) for information.
 

diff --git a/scripts/atlantis/docker-build.sh b/scripts/atlantis/docker-build.sh
@@ -5,7 +5,7 @@ set -o nounset
 set -o pipefail
 
 GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
-DOCKER_REPO="accurics/terrascan_atlantis"
+DOCKER_REPO="tenable/terrascan_atlantis"
 DIR="./integrations/atlantis"
 
 docker build -t ${DOCKER_REPO}:${GIT_COMMIT} ${DIR}
diff --git a/scripts/atlantis/docker-push-latest-tag.sh b/scripts/atlantis/docker-push-latest-tag.sh
@@ -5,7 +5,7 @@ set -o nounset
 set -o pipefail
 
 GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
-DOCKER_REPO="accurics/terrascan_atlantis"
+DOCKER_REPO="tenable/terrascan_atlantis"
 LATEST_TAG=$(git describe --abbrev=0 --tags)
 LATEST_TAG_SHORT=$(echo "${LATEST_TAG//v}")
 

diff --git a/scripts/atlantis/docker-push-latest.sh b/scripts/atlantis/docker-push-latest.sh
@@ -5,7 +5,7 @@ set -o nounset
 set -o pipefail
 
 GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
-DOCKER_REPO="accurics/terrascan_atlantis"
+DOCKER_REPO="tenable/terrascan_atlantis"
 LATEST_TAG="latest"
 
 # PS: It is a prerequisite to execute 'docker login' before running this script

diff --git a/scripts/atlantis/docker-push.sh b/scripts/atlantis/docker-push.sh
@@ -5,7 +5,7 @@ set -o nounset
 set -o pipefail
 
 GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
-DOCKER_REPO="accurics/terrascan_atlantis"
+DOCKER_REPO="tenable/terrascan_atlantis"
 
 # PS: It is a prerequisite to execute 'docker login' before running this script
 docker push ${DOCKER_REPO}:${GIT_COMMIT}
diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
@@ -5,11 +5,11 @@ set -o nounset
 set -o pipefail
 
 GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
-DOCKER_REPO="accurics/terrascan"
+DOCKER_REPO="tenable/terrascan"
 DOCKERFILE="./build/Dockerfile"
 
 docker buildx create --platform linux/amd64,linux/arm64 --name terrascan-builder --use
 
-docker buildx build -t ${DOCKER_REPO}:${GIT_COMMIT} -f ${DOCKERFILE} .
+docker buildx build -t ${DOCKER_REPO}:${GIT_COMMIT} -f ${DOCKERFILE} . --load
 
 docker buildx rm terrascan-builder
diff --git a/scripts/docker-push-latest-tag.sh b/scripts/docker-push-latest-tag.sh
@@ -5,8 +5,7 @@ set -o nounset
 set -o pipefail
 
 GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
-DOCKER_REPO="accurics/terrascan"
-DOCKERFILE="./build/Dockerfile"
+DOCKER_REPO="tenable/terrascan"
 LATEST_TAG=$(git describe --abbrev=0 --tags)
 LATEST_TAG_SHORT=$(echo "${LATEST_TAG//v}")
 

diff --git a/scripts/docker-push-latest.sh b/scripts/docker-push-latest.sh
@@ -5,8 +5,7 @@ set -o nounset
 set -o pipefail
 
 GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
-DOCKER_REPO="accurics/terrascan"
-DOCKERFILE="./build/Dockerfile"
+DOCKER_REPO="tenable/terrascan"
 LATEST_TAG="latest"
 
 # PS: It is a prerequisite to execute 'docker login' before running this script

diff --git a/scripts/docker-push.sh b/scripts/docker-push.sh
@@ -5,8 +5,7 @@ set -o nounset
 set -o pipefail
 
 GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
-DOCKER_REPO="accurics/terrascan"
-DOCKERFILE="./build/Dockerfile"
+DOCKER_REPO="tenable/terrascan"
 
 # PS: It is a prerequisite to execute 'docker login' before running this script
 docker push ${DOCKER_REPO}:${GIT_COMMIT}