Skip to content

Commit 162c2a0

Browse files
committed
Revert "Update docker actions"
This reverts commit df3d51f.
1 parent 573a7f7 commit 162c2a0

2 files changed

Lines changed: 10 additions & 16 deletions

File tree

.github/workflows/release.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,45 +16,39 @@ jobs:
1616
- uses: JS-DevTools/npm-publish@v1
1717
with:
1818
token: ${{ secrets.NPM_TOKEN }}
19-
2019
docker:
2120
runs-on: ubuntu-latest
2221
steps:
2322
- name: "Check out Git repository"
2423
uses: actions/checkout@v4
2524
- name: "Set up QEMU"
26-
uses: docker/setup-qemu-action@v3
25+
uses: docker/setup-qemu-action@v1
2726
- name: "Set up Docker Buildx"
28-
uses: docker/setup-buildx-action@v3
27+
uses: docker/setup-buildx-action@v1
2928
- name: "Login to DockerHub"
30-
uses: docker/login-action@v3
29+
uses: docker/login-action@v1
3130
with:
3231
username: ${{ secrets.DOCKERHUB_USERNAME }}
3332
password: ${{ secrets.DOCKERHUB_TOKEN }}
34-
- id: image-metadata
35-
name: Container Image Metadata
36-
uses: docker/metadata-action@v5
37-
with:
38-
images: ${{ env.CONTAINER_REGISTRY }}/multi-juicer/${{ matrix.component }}
39-
tags: |
40-
type=semver,pattern={{raw}}
41-
type=ref,event=branch
33+
- name: "Get tag name"
34+
id: tag
35+
uses: dawidd6/action-get-tag@v1
4236
- name: "Set labels for ${{ github.ref }}"
4337
run: |
4438
echo "VCS_REF=`git rev-parse --short HEAD`" >> $GITHUB_ENV
4539
echo "BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”`" >> $GITHUB_ENV
4640
- name: "Build and push"
47-
uses: docker/build-push-action@v6
41+
uses: docker/build-push-action@v2
4842
with:
4943
context: .
5044
file: ./Dockerfile
5145
platforms: linux/amd64,linux/arm/v7,linux/arm64
5246
push: true
53-
tags: ${{ steps.image-metadata.outputs.tags }}
47+
tags: |
48+
bkimminich/juice-shop-ctf:${{ steps.tag.outputs.tag }}
5449
build-args: |
5550
VCS_REF=${{ env.VCS_REF }}
5651
BUILD_DATE=${{ env.BUILD_DATE }}
57-
5852
notify-slack:
5953
if: always()
6054
needs:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ LABEL maintainer="Bjoern Kimminich <[email protected]>" \
1919
org.opencontainers.image.description="Capture-the-Flag (CTF) environment setup tools for OWASP Juice Shop" \
2020
org.opencontainers.image.authors="Bjoern Kimminich <[email protected]>" \
2121
org.opencontainers.image.vendor="Open Worldwide Application Security Project" \
22-
org.opencontainers.image.documentation="https://help.owasp-juice.shop/part1/ctf.html" \
22+
org.opencontainers.image.documentation="https://pwning.owasp-juice.shop/companion-guide/latest/part4/ctf.html" \
2323
org.opencontainers.image.licenses="MIT" \
2424
org.opencontainers.image.version="12.0.0" \
2525
org.opencontainers.image.url="https://owasp-juice.shop" \

0 commit comments

Comments
 (0)