Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/actions/docker-common/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ runs:
shell: bash
run: echo "date=$(date +%Y-%m-%d)" >> $GITHUB_OUTPUT
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v4
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v4
with:
username: ${{ inputs.DOCKER_USERNAME }}
password: ${{ inputs.DOCKER_PASSWORD }}
Expand All @@ -68,7 +68,7 @@ runs:
fi
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v6
with:
images: ${{ inputs.DOCKER_IMAGE }}
- name: Generate tags
Expand Down Expand Up @@ -112,7 +112,7 @@ runs:
echo "tag=${{ steps.date.outputs.date }}${{ inputs.IMAGE_SUFFIX }}-lts" >> $GITHUB_OUTPUT
fi
- name: Build and push Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v7
with:
context: ${{ inputs.DIRNAME }}
build-args: |
Expand All @@ -133,7 +133,7 @@ runs:
fi
- name: Build and publish non-root image
if: inputs.NON_ROOT == 'yes'
uses: docker/build-push-action@v4
uses: docker/build-push-action@v7
with:
context: no-root
build-args: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: |
docker build -t docker.io/my-organization/my-app:${{ github.sha }} --build-arg=BASE=yadd/lemonldap-ng-base:latest-no-s6 ./portal
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
uses: aquasecurity/trivy-action@v0.36.0
with:
image-ref: 'docker.io/my-organization/my-app:${{ github.sha }}'
format: 'template'
Expand Down