Skip to content

Commit

Permalink
Merge pull request #91 from kool-dev/dependabot-merge
Browse files Browse the repository at this point in the history
Dependabot merge
  • Loading branch information
fabriciojs authored Oct 23, 2023
2 parents 28ed51f + 81907d5 commit 928b2e1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.5.0
uses: actions/checkout@v4.1.1

- name: Setup QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v2
Expand All @@ -33,7 +33,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and export to Docker
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ${{ matrix.version }}${{ matrix.type }}
load: true
Expand All @@ -51,7 +51,7 @@ jobs:
docker run -e ENABLE_XDEBUG=true kooldev/php:${{ matrix.version }}${{ matrix.type }} php -m
- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-php'
with:
context: ${{ matrix.version }}${{ matrix.type }}
Expand All @@ -60,7 +60,7 @@ jobs:
tags: kooldev/php:${{ matrix.version }}${{ matrix.type }}

- name: Build and export to Docker (nginx)
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ${{ matrix.version }}-nginx${{ matrix.type }}
load: true
Expand All @@ -81,7 +81,7 @@ jobs:
docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} supervisord version
- name: Build and push (nginx)
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-php'
with:
context: ${{ matrix.version }}-nginx${{ matrix.type }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
docker-description:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.0
- uses: actions/checkout@v4.1.1

- name: Sync Docker Hub Description
uses: peter-evans/dockerhub-description@v3.3.0
uses: peter-evans/dockerhub-description@v3.4.2
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
Expand Down

0 comments on commit 928b2e1

Please sign in to comment.