Skip to content

Commit cd4ac4b

Browse files
Ilyes512Ilyes512
authored
Merge pull request #7 from Ilyes512/updates
Updates
2 parents 7dcf59b + 16c0c89 commit cd4ac4b

File tree

5 files changed

+57
-57
lines changed

5 files changed

+57
-57
lines changed

‎.github/workflows/main.yml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,28 @@ concurrency:
1515

1616
jobs:
1717
build:
18-
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@0.4.0
18+
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.2
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
platform:
23-
- linux/amd64
24-
- linux/arm64
22+
runs-on:
23+
- os: ubuntu-24.04
24+
platform: linux/amd64
25+
- os: ubuntu-24.04-arm
26+
platform: linux/arm64
2527
docker:
2628
- dockerfile: fpm/Dockerfile
2729
image-name: ghcr.io/${{ github.repository }}
28-
key: fpm
2930
- dockerfile: apache/Dockerfile
3031
image-name: ghcr.io/${{ github.repository }}/apache
31-
key: apache
3232
with:
33-
runs-on: ubuntu-24.04
34-
platform: ${{ matrix.platform }}
33+
runs-on: ${{ matrix.runs-on.os }}
34+
platform: ${{ matrix.runs-on.platform }}
3535
image-name: ${{ matrix.docker.image-name }}
3636
dockerfile: ${{ matrix.docker.dockerfile }}
37-
cache-key: ${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-${{ github.ref_name }}-${{ github.sha }}
38-
cache-restore-keys: |
39-
${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-${{ github.ref_name }}-
40-
${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}
4137

4238
merge:
43-
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@0.4.0
39+
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.2
4440
needs: build
4541
strategy:
4642
matrix:

‎.github/workflows/pr.yml‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,28 @@ concurrency:
1414

1515
jobs:
1616
build:
17-
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@0.4.0
17+
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.2
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
platform:
22-
- linux/amd64
23-
- linux/arm64
21+
runs-on:
22+
- os: ubuntu-24.04
23+
platform: linux/amd64
24+
- os: ubuntu-24.04-arm
25+
platform: linux/arm64
2426
docker:
2527
- dockerfile: fpm/Dockerfile
2628
image-name: ghcr.io/${{ github.repository }}
27-
key: fpm
2829
- dockerfile: apache/Dockerfile
2930
image-name: ghcr.io/${{ github.repository }}/apache
30-
key: apache
3131
with:
32-
runs-on: ubuntu-24.04
33-
platform: ${{ matrix.platform }}
32+
runs-on: ${{ matrix.runs-on.os }}
33+
platform: ${{ matrix.runs-on.platform }}
3434
image-name: ${{ matrix.docker.image-name }}
3535
dockerfile: ${{ matrix.docker.dockerfile }}
36-
cache-key: ${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-pr-${{ github.event.number }}-${{ github.sha }}
37-
cache-restore-keys: |
38-
${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-pr-${{ github.event.number }}-
39-
${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-pr-
40-
${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-main-
4136

4237
merge:
43-
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@0.4.0
38+
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.2
4439
needs: build
4540
strategy:
4641
matrix:

‎.github/workflows/tag.yml‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,28 @@ concurrency:
1515

1616
jobs:
1717
build:
18-
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@0.4.0
18+
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.2
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
platform:
23-
- linux/amd64
24-
- linux/arm64
22+
runs-on:
23+
- os: ubuntu-24.04
24+
platform: linux/amd64
25+
- os: ubuntu-24.04-arm
26+
platform: linux/arm64
2527
docker:
2628
- dockerfile: fpm/Dockerfile
2729
image-name: ghcr.io/${{ github.repository }}
28-
key: fpm
2930
- dockerfile: apache/Dockerfile
3031
image-name: ghcr.io/${{ github.repository }}/apache
31-
key: apache
3232
with:
33-
runs-on: ubuntu-24.04
34-
platform: ${{ matrix.platform }}
33+
runs-on: ${{ matrix.runs-on.os }}
34+
platform: ${{ matrix.runs-on.platform }}
3535
image-name: ${{ matrix.docker.image-name }}
3636
dockerfile: ${{ matrix.docker.dockerfile }}
37-
cache-key: ${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-${{ github.ref_name }}-${{ github.sha }}
38-
cache-restore-keys: |
39-
${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-${{ github.ref_name }}-
40-
${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-main-
41-
${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-
4237

4338
merge:
44-
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@0.4.0
39+
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.2
4540
needs: build
4641
strategy:
4742
matrix:

‎apache/Dockerfile‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Latest version of PHP base image: https://hub.docker.com/_/php?tab=tags
2-
FROM php:8.4.1-apache-bookworm AS runtime
2+
FROM php:8.4.4-apache-bookworm AS runtime
33

44
ARG UNIQUE_ID_FOR_CACHEFROM=runtime
55

@@ -19,6 +19,7 @@ WORKDIR /var/www
1919

2020
RUN apt-get update \
2121
&& apt-get install --assume-yes --no-install-recommends \
22+
apt-transport-https \
2223
ca-certificates \
2324
openssl \
2425
curl \
@@ -126,9 +127,9 @@ ARG UNIQUE_ID_FOR_CACHEFROM=builder
126127
# Latest version of Phive: https://api.github.com/repos/phar-io/phive/releases/latest
127128
ARG PHIVE_VERSION=0.15.3
128129
# Latest version of Composer: https://getcomposer.org/download
129-
ARG COMPOSER_VERSION=2.8.4
130+
ARG COMPOSER_VERSION=2.8.5
130131
# Latest version of Xdebug: https://github.com/xdebug/xdebug/tags or https://pecl.php.net/package/xdebug
131-
ARG XDEBUG_VERSION=3.4.0
132+
ARG XDEBUG_VERSION=3.4.1
132133
# Latest version of pcov: https://github.com/krakjoe/pcov/tags or https://pecl.php.net/package/pcov
133134
ARG PCOV_VERSION=1.0.12
134135

@@ -169,26 +170,32 @@ RUN apt-get update \
169170

170171
FROM builder AS builder_nodejs
171172

173+
ARG TARGETARCH
174+
172175
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
173176

174177
ARG UNIQUE_ID_FOR_CACHEFROM=builder_nodejs
175178

176179
# Latest version of Node.js: https://nodejs.org
177-
ARG NODE_MAJOR=20
180+
ARG NODE_MAJOR=22
178181

179182
RUN apt-get update \
180183
&& apt-get install --assume-yes --no-install-recommends \
181184
gcc \
182185
g++ \
183186
make \
184-
&& mkdir -p /etc/apt/keyrings \
185-
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
186-
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
187+
&& mkdir -p /usr/share/keyrings \
188+
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \
189+
&& chmod 644 /usr/share/keyrings/nodesource.gpg \
190+
&& echo "deb [arch=$TARGETARCH signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
191+
&& echo "Package: nodejs" | tee /etc/apt/preferences.d/nodejs > /dev/null \
192+
&& echo "Pin: origin deb.nodesource.com" | tee -a /etc/apt/preferences.d/nodejs > /dev/null \
193+
&& echo "Pin-Priority: 600" | tee -a /etc/apt/preferences.d/nodejs > /dev/null \
187194
&& apt-get update \
188195
&& apt-get install --assume-yes --no-install-recommends \
189196
nodejs \
190197
&& npm uninstall --global npm \
191-
&& corepack install --global npm yarn pnpm \
198+
&& corepack install --global npm@10.x yarn@4.x pnpm@9.x \
192199
&& corepack enable npm yarn pnpm \
193200
&& apt-get autoremove --assume-yes \
194201
&& apt-get clean --assume-yes \

‎fpm/Dockerfile‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Latest version of PHP base image: https://hub.docker.com/_/php?tab=tags
2-
FROM php:8.4.1-fpm-bookworm AS runtime
2+
FROM php:8.4.4-fpm-bookworm AS runtime
33

44
ARG UNIQUE_ID_FOR_CACHEFROM=runtime
55

@@ -19,6 +19,7 @@ WORKDIR /var/www
1919

2020
RUN apt-get update \
2121
&& apt-get install --assume-yes --no-install-recommends \
22+
apt-transport-https \
2223
ca-certificates \
2324
openssl \
2425
curl \
@@ -126,9 +127,9 @@ ARG UNIQUE_ID_FOR_CACHEFROM=builder
126127
# Latest version of Phive: https://api.github.com/repos/phar-io/phive/releases/latest
127128
ARG PHIVE_VERSION=0.15.3
128129
# Latest version of Composer: https://getcomposer.org/download
129-
ARG COMPOSER_VERSION=2.8.4
130+
ARG COMPOSER_VERSION=2.8.5
130131
# Latest version of Xdebug: https://github.com/xdebug/xdebug/tags or https://pecl.php.net/package/xdebug
131-
ARG XDEBUG_VERSION=3.4.0
132+
ARG XDEBUG_VERSION=3.4.1
132133
# Latest version of pcov: https://github.com/krakjoe/pcov/tags or https://pecl.php.net/package/pcov
133134
ARG PCOV_VERSION=1.0.12
134135

@@ -169,26 +170,32 @@ RUN apt-get update \
169170

170171
FROM builder AS builder_nodejs
171172

173+
ARG TARGETARCH
174+
172175
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
173176

174177
ARG UNIQUE_ID_FOR_CACHEFROM=builder_nodejs
175178

176179
# Latest version of Node.js: https://nodejs.org
177-
ARG NODE_MAJOR=20
180+
ARG NODE_MAJOR=22
178181

179182
RUN apt-get update \
180183
&& apt-get install --assume-yes --no-install-recommends \
181184
gcc \
182185
g++ \
183186
make \
184-
&& mkdir -p /etc/apt/keyrings \
185-
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
186-
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
187+
&& mkdir -p /usr/share/keyrings \
188+
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \
189+
&& chmod 644 /usr/share/keyrings/nodesource.gpg \
190+
&& echo "deb [arch=$TARGETARCH signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
191+
&& echo "Package: nodejs" | tee /etc/apt/preferences.d/nodejs > /dev/null \
192+
&& echo "Pin: origin deb.nodesource.com" | tee -a /etc/apt/preferences.d/nodejs > /dev/null \
193+
&& echo "Pin-Priority: 600" | tee -a /etc/apt/preferences.d/nodejs > /dev/null \
187194
&& apt-get update \
188195
&& apt-get install --assume-yes --no-install-recommends \
189196
nodejs \
190197
&& npm uninstall --global npm \
191-
&& corepack install --global npm yarn pnpm \
198+
&& corepack install --global npm@10.x yarn@4.x pnpm@9.x \
192199
&& corepack enable npm yarn pnpm \
193200
&& apt-get autoremove --assume-yes \
194201
&& apt-get clean --assume-yes \

0 commit comments

Comments
 (0)