Skip to content

Commit 1f62f21

Browse files
matthewbaggettmatthewbaggett
committed
alpine:3.22 dropped.
1 parent 841b16c commit 1f62f21

File tree

7 files changed

+90
-46
lines changed

7 files changed

+90
-46
lines changed

‎Alpine.Dockerfile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ INCLUDE ./Alpine.fragment.Dockerfile
88
FROM alpine:3.21 AS alpine-21-base
99
INCLUDE ./Alpine.fragment.Dockerfile
1010

11+
FROM alpine:3.22 AS alpine-22-base
12+
INCLUDE ./Alpine.fragment.Dockerfile
13+
1114
FROM alpine-21-base AS builder-21-base
1215
ARG BUILDER_PACKAGES="build-base linux-headers openssl-dev zlib-dev"
1316
RUN apk add --no-cache $BUILDER_PACKAGES
17+
18+
FROM alpine-22-base AS builder-22-base
19+
ARG BUILDER_PACKAGES="build-base linux-headers openssl-dev zlib-dev"
20+
RUN apk add --no-cache $BUILDER_PACKAGES

‎PHP.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# / /_/ / /_/ / /_/ / __ / // /_
55
# / ____/ __ / ____/ /_/ /__ __/
66
# /_/ /_/ /_/_/ \____(_)/_/
7-
FROM ./Alpine.Dockerfile#alpine-21-base AS php-84-base
7+
FROM ./Alpine.Dockerfile#alpine-22-base AS php-84-base
88
ARG COMPOSER_VERSION=latest-stable
99
ARG PHP_PACKAGES="php84 php84-bcmath php84-bz2 php84-calendar php84-ctype php84-curl php84-dom php84-exif php84-fileinfo php84-ftp \
1010
php84-fpm php84-gd php84-gettext php84-gmp php84-iconv php84-imap php84-intl php84-json php84-ldap php84-mbstring \

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ More can be read in the [runit documentation](http://smarden.org/runit) particul
6262

6363
| Container | Is Latest | Version | Alpine | PHP Version | Node Version | Tag |
6464
| --------- | --------- | ----------- | ----------- | ----------- | ------------ | ------------------------------------- |
65-
| Magento | ️ | | Alpine 3.21 | PHP 8.4 | Node 22 | ghcr.io/roushtech/docker/magento:8.4 |
65+
| Magento | ️ | | Alpine 3.22 | PHP 8.4 | Node 22 | ghcr.io/roushtech/docker/magento:8.4 |
6666
| Magento | ✔️ | | Alpine 3.18 | PHP 8.1 | Node 18 | ghcr.io/roushtech/docker/magento:8.1 |
67-
| PHP+Node | ️ | PHP 8.4 | Alpine 3.21 | PHP 8.4 | Node 22 | ghcr.io/roushtech/docker/php-node:8.4 |
67+
| PHP+Node | ️ | PHP 8.4 | Alpine 3.22 | PHP 8.4 | Node 22 | ghcr.io/roushtech/docker/php-node:8.4 |
6868
| PHP+Node | ✔️ | PHP 8.1 | Alpine 3.18 | PHP 8.1 | Node 18 | ghcr.io/roushtech/docker/php-node:8.1 |
6969
| PHP | | PHP 8.4 | Alpine 3.21 | PHP 8.4 | | ghcr.io/roushtech/docker/php-node:8.4 |
7070
| PHP | | PHP 8.1 | Alpine 3.18 | PHP 8.1 | | ghcr.io/roushtech/docker/php-node:8.1 |

‎docker-bake.hcl‎

Lines changed: 63 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ variable "TIMESTAMP"{
1313
}
1414
group "default" {
1515
targets = [
16+
"alpine-22",
1617
"alpine-21",
1718
"alpine-18",
1819
"alpine-15",
20+
"builder-22",
1921
"builder-21",
2022
"php-74",
2123
"php-81",
@@ -36,6 +38,7 @@ group "default" {
3638
}
3739
group "alpine" {
3840
targets = [
41+
"alpine-22",
3942
"alpine-21",
4043
"alpine-18",
4144
"alpine-15",
@@ -60,6 +63,18 @@ group "magento" {
6063
"magento-81",
6164
]
6265
}
66+
target "alpine-22" {
67+
dockerfile = "Alpine.Dockerfile"
68+
target = "alpine-22-base"
69+
tags = [
70+
"ghcr.io/roushtech/docker/base:3.22",
71+
"ghcr.io/roushtech/docker/base:3.22-${TIMESTAMP}",
72+
]
73+
platforms = PLATFORMS
74+
labels = {
75+
"org.opencontainers.image.description" = "Roushtech-flavoured Alpine Linux base image"
76+
}
77+
}
6378
target "alpine-21" {
6479
dockerfile = "Alpine.Dockerfile"
6580
target = "alpine-21-base"
@@ -68,9 +83,9 @@ target "alpine-21" {
6883
"ghcr.io/roushtech/docker/base:3.21-${TIMESTAMP}",
6984
]
7085
platforms = PLATFORMS
71-
labels = {
72-
"org.opencontainers.image.description" = "Roushtech-flavoured Alpine Linux base image"
73-
}
86+
labels = {
87+
"org.opencontainers.image.description" = "Roushtech-flavoured Alpine Linux base image"
88+
}
7489
}
7590
target "alpine-18" {
7691
dockerfile = "Alpine.Dockerfile"
@@ -97,6 +112,18 @@ target "alpine-15" {
97112
"org.opencontainers.image.description" = "Roushtech-flavoured Alpine Linux base image"
98113
}
99114
}
115+
target "builder-22" {
116+
dockerfile = "Alpine.Dockerfile"
117+
target = "builder-22-base"
118+
tags = [
119+
"ghcr.io/roushtech/docker/builder:3.22",
120+
"ghcr.io/roushtech/docker/builder:3.22-${TIMESTAMP}",
121+
]
122+
platforms = PLATFORMS
123+
labels = {
124+
"org.opencontainers.image.description" = "Roushtech-flavoured Alpine Linux base image that has build tools installed"
125+
}
126+
}
100127
target "builder-21" {
101128
dockerfile = "Alpine.Dockerfile"
102129
target = "builder-21-base"
@@ -109,17 +136,18 @@ target "builder-21" {
109136
"org.opencontainers.image.description" = "Roushtech-flavoured Alpine Linux base image that has build tools installed"
110137
}
111138
}
112-
target "php-74" {
139+
target "php-84" {
113140
dockerfile = "PHP.Dockerfile"
114-
target = "php-74-base"
141+
target = "php-84-base"
115142
tags = [
116-
"ghcr.io/roushtech/docker/php:7.4",
117-
"ghcr.io/roushtech/docker/php:7.4-${TIMESTAMP}",
143+
"ghcr.io/roushtech/docker/php:latest",
144+
"ghcr.io/roushtech/docker/php:8.4",
145+
"ghcr.io/roushtech/docker/php:8.4-${TIMESTAMP}",
118146
]
119147
platforms = PLATFORMS
120-
labels = {
121-
"org.opencontainers.image.description" = "PHP 7.4 base image"
122-
}
148+
labels = {
149+
"org.opencontainers.image.description" = "PHP 8.4 base image"
150+
}
123151
}
124152
target "php-81" {
125153
dockerfile = "PHP.Dockerfile"
@@ -133,30 +161,16 @@ target "php-81" {
133161
"org.opencontainers.image.description" = "PHP 8.1 base image"
134162
}
135163
}
136-
target "php-84" {
137-
dockerfile = "PHP.Dockerfile"
138-
target = "php-84-base"
139-
tags = [
140-
"ghcr.io/roushtech/docker/php:latest",
141-
"ghcr.io/roushtech/docker/php:8.4",
142-
"ghcr.io/roushtech/docker/php:8.4-${TIMESTAMP}",
143-
]
144-
platforms = PLATFORMS
145-
labels = {
146-
"org.opencontainers.image.description" = "PHP 8.4 base image"
147-
}
148-
}
149-
target "php-81-node" {
164+
target "php-74" {
150165
dockerfile = "PHP.Dockerfile"
151-
target = "php-81-node-base"
166+
target = "php-74-base"
152167
tags = [
153-
"ghcr.io/roushtech/docker/php-node:latest",
154-
"ghcr.io/roushtech/docker/php-node:8.1",
155-
"ghcr.io/roushtech/docker/php-node:8.1-${TIMESTAMP}",
168+
"ghcr.io/roushtech/docker/php:7.4",
169+
"ghcr.io/roushtech/docker/php:7.4-${TIMESTAMP}",
156170
]
157171
platforms = PLATFORMS
158172
labels = {
159-
"org.opencontainers.image.description" = "PHP 8.1 with Node.js base image"
173+
"org.opencontainers.image.description" = "PHP 7.4 base image"
160174
}
161175
}
162176
target "php-84-node" {
@@ -171,17 +185,17 @@ target "php-84-node" {
171185
"org.opencontainers.image.description" = "PHP 8.4 with Node.js base image"
172186
}
173187
}
174-
target "magento-81" {
175-
dockerfile = "Magento.Dockerfile"
176-
target = "magento-81-node-base"
188+
target "php-81-node" {
189+
dockerfile = "PHP.Dockerfile"
190+
target = "php-81-node-base"
177191
tags = [
178-
"ghcr.io/roushtech/docker/magento:latest",
179-
"ghcr.io/roushtech/docker/magento:8.1",
180-
"ghcr.io/roushtech/docker/magento:8.1-${TIMESTAMP}",
192+
"ghcr.io/roushtech/docker/php-node:latest",
193+
"ghcr.io/roushtech/docker/php-node:8.1",
194+
"ghcr.io/roushtech/docker/php-node:8.1-${TIMESTAMP}",
181195
]
182196
platforms = PLATFORMS
183197
labels = {
184-
"org.opencontainers.image.description" = "Magento on PHP 8.1 with Node.js base image"
198+
"org.opencontainers.image.description" = "PHP 8.1 with Node.js base image"
185199
}
186200
}
187201
target "magento-84" {
@@ -195,4 +209,17 @@ target "magento-84" {
195209
labels = {
196210
"org.opencontainers.image.description" = "Magento on PHP 8.4 with Node.js base image"
197211
}
212+
}
213+
target "magento-81" {
214+
dockerfile = "Magento.Dockerfile"
215+
target = "magento-81-node-base"
216+
tags = [
217+
"ghcr.io/roushtech/docker/magento:latest",
218+
"ghcr.io/roushtech/docker/magento:8.1",
219+
"ghcr.io/roushtech/docker/magento:8.1-${TIMESTAMP}",
220+
]
221+
platforms = PLATFORMS
222+
labels = {
223+
"org.opencontainers.image.description" = "Magento on PHP 8.1 with Node.js base image"
224+
}
198225
}

‎test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ echo "Running tests ... "
2222
if ! $DC_CMD up --detach --wait --build; then
2323
banner "Failure!" | colorize $COLOR_RED
2424
echo "Container build tests failed."
25-
echo " Hint: Try running $(docker compose -f tests.yml up --build failed-target) to see more details."
25+
echo ' Hint: Try running "docker compose -f test.yml up --build failed-target" to see more details.'
2626
ring_bell "fail"
2727
exit 1
2828
fi

‎test-versions-assertions.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ services:
7777
- source: node_test
7878
target: /app/test.sh
7979
environment: &php84_expected
80-
EXPECTED_ALPINE_VERSION: "3.21"
80+
EXPECTED_ALPINE_VERSION: "3.22"
8181
EXPECTED_PHP_VERSION: "8.4"
8282
EXPECTED_NODE_VERSION: "22"
83-
EXPECTED_NPM_VERSION: "10"
83+
EXPECTED_NPM_VERSION: "11"
8484
magento-php81-assertions:
8585
build:
8686
dockerfile: Magento.Dockerfile
@@ -116,6 +116,17 @@ services:
116116
target: /app/test.sh
117117
environment:
118118
<<: *php81_expected
119+
base-22-assertions:
120+
build:
121+
context: .
122+
dockerfile: Alpine.Dockerfile
123+
target: alpine-22-base
124+
command: ["bash", "/app/test.sh"]
125+
environment:
126+
EXPECTED_ALPINE_VERSION: "3.22"
127+
configs:
128+
- source: base_test
129+
target: /app/test.sh
119130
base-21-assertions:
120131
build:
121132
context: .

‎test.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ include:
44

55
services:
66
test:
7-
build:
8-
dockerfile_inline: |
9-
FROM alpine:3.21
10-
RUN apk add --no-cache bash bash-completion curl
7+
image: alpine:3.22
118
command: ["sleep", "infinity"]
129
depends_on:
1310
# Validation scripts should just exit 0 if the container is happy
@@ -19,6 +16,8 @@ services:
1916
condition: service_completed_successfully
2017
php81-node-assertions:
2118
condition: service_completed_successfully
19+
base-22-assertions:
20+
condition: service_completed_successfully
2221
base-21-assertions:
2322
condition: service_completed_successfully
2423
base-18-assertions:

0 commit comments

Comments
 (0)