Skip to content

Commit

Permalink
Merge pull request #4 from digiBlink/update_20241114
Browse files Browse the repository at this point in the history
updated base image and actions
  • Loading branch information
zxpower authored Nov 14, 2024
2 parents a3c1cf2 + a747bf9 commit a314bf3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
GHCR_PAT: ${{secrets.GHCR_PAT}}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Docker meta
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/digiblink/alpine-nginx-php74-pdf
Expand All @@ -28,13 +28,13 @@ jobs:
labels: |
org.opencontainers.image.vendor=digiBlink
- name: Login to Github Packages
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GHCR_PAT }}
- name: Build image and push to GitHub Container Registry
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
GHCR_PAT: ${{secrets.GHCR_PAT}}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Docker meta
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/digiblink/alpine-nginx-php74-pdf
Expand All @@ -26,13 +26,13 @@ jobs:
labels: |
org.opencontainers.image.vendor=digiBlink
- name: Login to Github Packages
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GHCR_PAT }}
- name: Build image and push to GitHub Container Registry
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# final stage
FROM php:7.4.29-fpm-alpine3.14@sha256:08d205874f4a1942d9cd07e9f1490dbe5ea3a4cdb707b4e4d252ea7a3c5b8348
FROM php:7.4.33-fpm-alpine3.16@sha256:0aeb129a60daff2874c5c70fcd9d88cdf3015b4fb4cc7c3f1a32a21e84631036

LABEL org.opencontainers.image.source https://github.com/digiblink/alpine-nginx-php74-pdf
LABEL org.opencontainers.image.description Alpine Linux Docker image with Nginx, PHP-FPM and wkhtmltopdf
Expand All @@ -20,7 +20,7 @@ RUN { \

# phalcon version setting
ARG PSR_VERSION=1.2.0
ARG PHALCON_VERSION=4.1.3
ARG PHALCON_VERSION=5.8.0
ARG PHALCON_EXT_PATH=php7/64bits

RUN set -xe && \
Expand Down

0 comments on commit a314bf3

Please sign in to comment.