Skip to content

Commit 6cab355

Browse files
committed
Merge branch 'main' of github.com:Coderockr/docker-php into apache
2 parents 91b7bf0 + 1c75e80 commit 6cab355

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/build.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,32 @@ jobs:
2323

2424
steps:
2525
- name: Check out the repo
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v6
2727

2828
- name: Log in to Docker Hub
2929
if: github.event_name != 'pull_request'
30-
uses: docker/login-action@v1.12.0
30+
uses: docker/login-action@v4
3131
with:
3232
username: ${{ secrets.DOCKER_USERNAME }}
3333
password: ${{ secrets.DOCKER_PASSWORD }}
3434

3535
- name: Set up QEMU
36-
uses: docker/setup-qemu-action@v1
36+
uses: docker/setup-qemu-action@v4
3737

3838
- name: Set up Docker Buildx
39-
uses: docker/setup-buildx-action@v1
39+
uses: docker/setup-buildx-action@v4
4040

4141
- name: Log in to the Container registry
4242
if: github.event_name != 'pull_request'
43-
uses: docker/login-action@v1.12.0
43+
uses: docker/login-action@v4
4444
with:
4545
registry: ghcr.io
4646
username: ${{ github.actor }}
4747
password: ${{ secrets.GITHUB_TOKEN }}
4848

4949
- name: Extract metadata (tags, labels) for Docker
5050
id: meta
51-
uses: docker/metadata-action@v3
51+
uses: docker/metadata-action@v5
5252
with:
5353
images: |
5454
coderockr/php
@@ -64,7 +64,7 @@ jobs:
6464
type=sha
6565
6666
- name: Build and push Docker image
67-
uses: docker/build-push-action@v2.7.0
67+
uses: docker/build-push-action@v6
6868
with:
6969
context: .
7070
push: ${{ github.event_name != 'pull_request' }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
FROM php:8.4-apache
1+
FROM php:8.5-apache
22

33
# keep ordered alphabetically to reduce diffs
44
RUN apt update && apt install -y \
5+
sudo \
56
acl \
67
apt-transport-https \
78
build-essential \
@@ -29,7 +30,6 @@ RUN apt update && apt install -y \
2930
zip
3031

3132
RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && locale-gen \
32-
&& docker-php-ext-enable opcache \
3333
&& docker-php-ext-configure gettext --with-gettext=/usr/include/ \
3434
&& docker-php-ext-configure gd --with-jpeg --with-webp --with-freetype \
3535
&& docker-php-ext-configure zip \

0 commit comments

Comments
 (0)