Merge branch 'add-sthttpd-cve' of https://github.com/sciencemanx/Vuln…

…erabilitiesLab into add-sthttpd-cve
guidovranken · Jun 8, 2020 · 94a9b1a · 94a9b1a
2 parents 19289cf + e5dc371
commit 94a9b1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/push.sh b/.github/push.sh
@@ -1,12 +1,13 @@
 # Pushes image to logged in docker registry (tagged with github ref)
 
 IMAGE_ID=$1
+REF=$2
 
 # Change all uppercase to lowercase
 IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
 
 # Strip git ref prefix from version
-VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+VERSION=$(echo "$REF" | sed -e 's,.*/\(.*\),\1,')
 
 # Strip "v" prefix from tag name
 [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')

diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
@@ -20,7 +20,7 @@ jobs:
       run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
 
     - name: Push the docker image
-      run: ./.github/push.sh forallsecure/openssl-cve-2014-0160
+      run: ./.github/push.sh forallsecure/openssl-cve-2014-0160 "${{ github.ref }}"
 
   cereal-cve-2020-11104-11105:
     runs-on: ubuntu-latest
@@ -34,7 +34,7 @@ jobs:
       run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
 
     - name: Push the docker image
-      run: ./.github/push.sh forallsecure/cereal-cve-2020-11104-11105
+      run: ./.github/push.sh forallsecure/cereal-cve-2020-11104-11105 "${{ github.ref }}"
 
   sthttpd-cve-2017-10671:
     runs-on: ubuntu-latest
@@ -48,4 +48,4 @@ jobs:
       run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
 
     - name: Push the docker image
-      run: ./.github/push.sh forallsecure/sthttpd-cve-2017-10671
+      run: ./.github/push.sh forallsecure/sthttpd-cve-2017-10671 "${{ github.ref }}"