Skip to content

Commit

Permalink
Merge branch 'master' of github.com:fabriziofiorucci/NGINX-Demos
Browse files Browse the repository at this point in the history
  • Loading branch information
fabriziofiorucci committed Oct 19, 2023
2 parents f5bf95e + 82ff51e commit d2aa00c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,24 @@ jobs:
base-image: library/nginx:mainline-alpine
image: ${{ steps.variables.outputs.image }}
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
if: ${{ steps.update.outputs.needs-updating == 'true' }}
- name: Setup QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: arm/v6,arm,arm64,amd64,ppc64le,s390x,386
if: ${{ steps.update.outputs.needs-updating == 'true' }}
- name: Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
if: ${{ steps.update.outputs.needs-updating == 'true' }}
- name: DockerHub Login
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
if: ${{ steps.update.outputs.needs-updating == 'true' }}
- name: Push to Dockerhub for nginx-hello
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ${{ matrix.context }}
file: ${{ matrix.file }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down

0 comments on commit d2aa00c

Please sign in to comment.