update the workflow actions to the latest versions

OWASP · Sep 16, 2023 · 53c058e · 53c058e
2 parents 12e5d50 + 4b83e22
commit 53c058e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/.github/workflows/housekeeping.yaml b/.github/workflows/housekeeping.yaml
@@ -24,7 +24,7 @@ jobs:
           keep_minimum_runs: 10
 
       - name: Delete unused workflows
-        uses: otto-de/purge-deprecated-workflow-runs@v1.4.0
+        uses: otto-de/purge-deprecated-workflow-runs@v2.0.1
         with:
           token: ${{ github.token }}
 

diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -214,7 +214,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.10.0
+        uses: docker/setup-buildx-action@v3.0.0
         with:
           install: true
 
@@ -227,14 +227,14 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4.2.0
+        uses: docker/build-push-action@v5.0.0
         with:
           context: ./
           file: ./Dockerfile

diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -215,7 +215,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.10.0
+        uses: docker/setup-buildx-action@v3.0.0
         with:
           install: true
 
@@ -228,14 +228,14 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4.2.0
+        uses: docker/build-push-action@v5.0.0
         with:
           context: ./
           file: ./Dockerfile
@@ -254,7 +254,7 @@ jobs:
         run: docker pull ${{ env.IMAGE_NAME }}
 
       - name: Login to Heroku Registry
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         with:
           registry: registry.heroku.com
           username: _

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -348,7 +348,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.10.0
+        uses: docker/setup-buildx-action@v3.0.0
         with:
           install: true
 
@@ -361,14 +361,14 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push to Docker Hub
         id: docker_build
-        uses: docker/build-push-action@v4.2.0
+        uses: docker/build-push-action@v5.0.0
         with:
           context: ./
           file: ./Dockerfile

diff --git a/.release-note-template.md b/.release-note-template.md
@@ -2,6 +2,10 @@
 
 The web application is provided as a [.tar.gz file][tar] or a [.zip file][zip] along with a software bill of materials ([SBOM][sboms]).
 
+#### Docker container
+
+Pull from docker hub using `docker pull --platform linux/x86_64 owasp/threat-dragon:v2.x.x`
+
 ### Desktop version
 
 |Platform | File | checksum |
@@ -14,7 +18,7 @@ The web application is provided as a [.tar.gz file][tar] or a [.zip file][zip] a
 
 #### Installing on Windows
 
-Depending on the security applied in your Windows, you may need to open the file properties
+Depending on the security applied in your Windows system, you may need to open the file properties
 and check the 'Unblock' checkbox to allow Threat Dragon to run  
 
 #### Installing on MacOS
@@ -29,10 +33,6 @@ The Snap image is available from the [official snapcraft distribution][snap]
 `.rpm` for Red Hat Linux, AIX, CentOS, Fedora  
 `.deb` for debian based Linux such as Ubuntu, Trisqel and Debian itself  
 
-#### Docker container
-
-Pull from docker hub using `docker pull --platform linux/x86_64 owasp/threat-dragon:v2.x.x`  
-
 [app]: https://github.com/OWASP/threat-dragon/releases/download/v2.x.x/Threat-Dragon-ng-2.x.x.AppImage
 [deb]: https://github.com/OWASP/threat-dragon/releases/download/v2.x.x/threat-dragon_2.x.x_amd64.deb
 [dmg]: https://github.com/OWASP/threat-dragon/releases/download/v2.x.x/Threat-Dragon-ng-2.x.x.dmg

diff --git a/release-process.md b/release-process.md
@@ -26,7 +26,7 @@ The github release workflow then creates the draft release and the install image
     `docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.0.6`
 4. Test using the command to run a detached container:
     `docker run -d -p 8080:3000 -v $(pwd)/.env:/app/.env threatdragon/owasp-threat-dragon:v2.0.6`
-5. Ideally test this release on Windows, linux and MacOS
+5. Ideally test this release on Windows, linux and MacOS using `http://localhost:8080/#/`
 
 If the image tests correctly, promote the docker image
 from dockerhub `threatdragon/` to dockerhub `OWASP/threat-dragon/v2.0.6`.
@@ -37,8 +37,11 @@ There is _no going back_ on this last step, so it is deliberately left as a manu
 docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.0.6
 docker tag threatdragon/owasp-threat-dragon:v2.0.6 owasp/threat-dragon:v2.0.6
 docker push owasp/threat-dragon:v2.0.6
+docker pull owasp/threat-dragon:v2.0.6
 ```
 
+ensure the tag now exists within the OWASP Docker hub: `https://hub.docker.com/r/owasp/threat-dragon/tags`
+
 ### Update release notes
 
 Update the release notes for the draft in the [Threat Dragon release area][area]