Skip to content

Commit 13dd7ef

Browse files
committed
3.1.1: GHCR, Composer 2.2.25, Ext builder upgrade
1 parent 700f0e3 commit 13dd7ef

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

.github/workflows/docker-hub.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
id: meta
3939
uses: docker/metadata-action@v4
4040
with:
41-
images: ${{ github.repository }}
41+
images: |
42+
${{ github.repository }}
43+
ghcr.io/${{ github.repository }}
4244
flavor: 'latest=false'
4345
tags: |
4446
type=semver,pattern=${{ matrix.php }}-{{version}}
@@ -68,11 +70,18 @@ jobs:
6870
uses: docker/setup-buildx-action@v3
6971

7072
- name: Login to DockerHub
71-
uses: docker/login-action@v2
73+
uses: docker/login-action@v3
7274
with:
7375
username: ${{ secrets.DOCKERHUB_USERNAME }}
7476
password: ${{ secrets.DOCKERHUB_TOKEN }}
7577

78+
- name: Login to GitHub Container Registry
79+
uses: docker/login-action@v3
80+
with:
81+
registry: ghcr.io
82+
username: ${{ github.repository_owner }}
83+
password: ${{ secrets.GITHUB_TOKEN }}
84+
7685
- name: Build and push
7786
id: build
7887
uses: docker/build-push-action@v5

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM php:$PHP_VER-fpm-alpine$OS_VER
55

66
# -------- Add packages and build/install tools
77

8-
COPY --from=mlocati/php-extension-installer:2.1.75 /usr/bin/install-php-extensions /usr/bin/
8+
COPY --from=mlocati/php-extension-installer:2.7.23 /usr/bin/install-php-extensions /usr/bin/
99
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
1010
RUN apk --no-cache add \
1111
--repository http://dl-3.alpinelinux.org/alpine/edge/community \
@@ -20,7 +20,7 @@ RUN apk --no-cache add \
2020

2121
# -------- Setup composer and runtime environment
2222

23-
ADD https://getcomposer.org/download/2.1.5/composer.phar /usr/bin/composer
23+
COPY --from=composer/composer:2.2.25-bin /composer /usr/bin/composer
2424
ADD https://curl.se/ca/cacert.pem /etc/cacert.pem
2525
RUN chmod ugo+rx /usr/bin/composer && \
2626
chmod ugo+r /etc/supervisord.conf && \

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# dirtsimple/php-server
1+
# ghcr.io/dirtsimple/php-server
22

33
### Overview
44

0 commit comments

Comments
 (0)