Skip to content

Commit 66206b9

Browse files
committed
Ajout de la prise en charge de la version de construction dans les images Docker pour CLI, FrankenPHP et Sail, avec des métadonnées enrichies pour une meilleure documentation.
1 parent d873f5f commit 66206b9

3 files changed

Lines changed: 39 additions & 1 deletion

File tree

src/variations/cli/Dockerfile

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,26 @@ ARG BASE_OS_VERSION='bookworm'
22
ARG PHP_VERSION='8.4'
33
ARG PHP_VARIATION='cli'
44
ARG BASE_REPO='serversideup/php'
5-
ARG BASE_IMAGE="${BASE_REPO}:${PHP_VERSION}-cli-${BASE_OS_VERSION}-v4.0.0-beta2"
5+
ARG TAG_PREFIX=''
6+
ARG BASE_IMAGE="${BASE_REPO}:${TAG_PREFIX}${PHP_VERSION}-${PHP_VARIATION}-${BASE_OS_VERSION}-v4.0.0-beta2"
67

78
##########
89
# CLI: Main Image
910
##########
1011
FROM ${BASE_IMAGE}
1112

13+
ARG REPOSITORY_BUILD_VERSION='dev'
14+
15+
LABEL org.opencontainers.image.title="yieldstudio/php (cli)" \
16+
org.opencontainers.image.description="Supercharge your PHP experience. Based off the official PHP images and serversideup/php, yieldstudio/php includes pre-configured PHP extensions and settings for enhanced performance and security. Optimized for Laravel and WordPress." \
17+
org.opencontainers.image.url="https://yieldstudio.github.io/docker-php/" \
18+
org.opencontainers.image.source="https://github.com/YieldStudio/docker-php" \
19+
org.opencontainers.image.documentation="https://yieldstudio.github.io/docker-php/" \
20+
org.opencontainers.image.vendor="YieldStudio" \
21+
org.opencontainers.image.authors="Arnaud RITTI (@arnaud-ritti)" \
22+
org.opencontainers.image.version="${REPOSITORY_BUILD_VERSION}" \
23+
org.opencontainers.image.licenses="GPL-3.0-or-later"
24+
1225
ARG DEPENDENCY_PACKAGES_ALPINE='icu-data-full'
1326
ARG DEPENDENCY_PACKAGES_DEBIAN=''
1427
ARG DEPENDENCY_PHP_EXTENSIONS='intl'

src/variations/frankenphp/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,18 @@ USER www-data
3737
####################
3838
FROM common AS final
3939

40+
ARG REPOSITORY_BUILD_VERSION='dev'
41+
42+
LABEL org.opencontainers.image.title="yieldstudio/php (frankenphp)" \
43+
org.opencontainers.image.description="Supercharge your PHP experience. Based off the official PHP images and serversideup/php, yieldstudio/php includes pre-configured PHP extensions and settings for enhanced performance and security. Optimized for Laravel and WordPress." \
44+
org.opencontainers.image.url="https://yieldstudio.github.io/docker-php/" \
45+
org.opencontainers.image.source="https://github.com/YieldStudio/docker-php" \
46+
org.opencontainers.image.documentation="https://yieldstudio.github.io/docker-php/" \
47+
org.opencontainers.image.vendor="YieldStudio" \
48+
org.opencontainers.image.authors="Arnaud RITTI (@arnaud-ritti)" \
49+
org.opencontainers.image.version="${REPOSITORY_BUILD_VERSION}" \
50+
org.opencontainers.image.licenses="GPL-3.0-or-later"
51+
4052
ENTRYPOINT ["docker-php-serversideup-entrypoint"]
4153

4254
CMD ["frankenphp", "run", "--config", "/etc/frankenphp/Caddyfile", "--adapter", "caddyfile"]

src/variations/sail/Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ ARG BASE_IMAGE="${BASE_REPO}:${TAG_PREFIX}${PHP_VERSION}-frankenphp-${BASE_OS_VE
1010
########################
1111
FROM ${BASE_IMAGE} AS common
1212

13+
ARG REPOSITORY_BUILD_VERSION='dev'
14+
15+
LABEL org.opencontainers.image.title="yieldstudio/sail (frankenphp)" \
16+
org.opencontainers.image.description="Supercharge your PHP experience. Based off the official PHP images and serversideup/php, yieldstudio/php includes pre-configured PHP extensions and settings for enhanced performance and security. Optimized for Laravel and WordPress." \
17+
org.opencontainers.image.url="https://yieldstudio.github.io/docker-php/" \
18+
org.opencontainers.image.source="https://github.com/YieldStudio/docker-php" \
19+
org.opencontainers.image.documentation="https://yieldstudio.github.io/docker-php/" \
20+
org.opencontainers.image.vendor="YieldStudio" \
21+
org.opencontainers.image.authors="Arnaud RITTI (@arnaud-ritti)" \
22+
org.opencontainers.image.version="${REPOSITORY_BUILD_VERSION}" \
23+
org.opencontainers.image.licenses="GPL-3.0-or-later"
24+
25+
1326
ARG SOPS_VERSION="v3.10.2"
1427
ARG NODE_VERSION=24
1528

0 commit comments

Comments
 (0)