Adjusted argument order

serversideup · Nov 29, 2023 · b720ea6 · b720ea6
1 parent 76fbfa6
commit b720ea6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/variations/cli/Dockerfile b/src/variations/cli/Dockerfile
@@ -1,12 +1,17 @@
 ARG BASE_OS_VERSION='bookworm'
 ARG PHP_VERSION='8.3'
 ARG PHP_VARIATION='cli'
+
+##########
+# CLI Image
+##########
+FROM php:${PHP_VERSION}-${PHP_VARIATION}-${BASE_OS_VERSION}
+
 ARG DEPENDENCY_PACKAGES_ALPINE='postgresql-dev libzip-dev sqlite sqlite-dev'
 ARG DEPENDENCY_PACKAGES_DEBIAN='libpq-dev libzip-dev sqlite3 libsqlite3-dev'
 ARG PECL_PACKAGES
 ARG REPOSITORY_BUILD_VERSION='dev'
 
-FROM php:${PHP_VERSION}-${PHP_VARIATION}-${BASE_OS_VERSION}
 LABEL org.opencontainers.image.title="serversideup/php (${PHP_VARIATION})" \
     org.opencontainers.image.description="Production-ready Docker images for PHP. Optimized for Laravel, WordPress, and more!" \
     org.opencontainers.image.url="https://serversideup.net/open-source/docker-php/" \

diff --git a/src/variations/fpm-nginx/Dockerfile b/src/variations/fpm-nginx/Dockerfile
@@ -49,7 +49,7 @@ RUN docker-php-serversideup-dep-install-debian "curl gnupg2 ca-certificates lsb-
     printf "Package: *\nPin: origin nginx.org\nPin-Priority: 900\n" > /etc/apt/preferences.d/99nginx
 
 ##########
-# Main
+# FPM-NGINX: Main Image
 ##########
 FROM ${BASE_IMAGE}
 ARG DEPENDENCY_PACKAGES_ALPINE='fcgi gettext postgresql-dev libzip-dev sqlite sqlite-dev'

diff --git a/src/variations/fpm/Dockerfile b/src/variations/fpm/Dockerfile
@@ -1,12 +1,17 @@
 ARG BASE_OS_VERSION='bookworm'
 ARG PHP_VERSION='8.3'
 ARG PHP_VARIATION='fpm'
-ARG DEPENDENCY_PACKAGES_ALPINE
-ARG DEPENDENCY_PACKAGES_DEBIAN
+
+##########
+# FPM image
+##########
+FROM php:${PHP_VERSION}-${PHP_VARIATION}-${BASE_OS_VERSION}
+
+ARG DEPENDENCY_PACKAGES_ALPINE='postgresql-dev libzip-dev sqlite sqlite-dev'
+ARG DEPENDENCY_PACKAGES_DEBIAN='libpq-dev libzip-dev sqlite3 libsqlite3-dev'
 ARG PECL_PACKAGES
 ARG REPOSITORY_BUILD_VERSION='dev'
 
-FROM php:${PHP_VERSION}-${PHP_VARIATION}-${BASE_OS_VERSION}
 LABEL org.opencontainers.image.title="serversideup/php (${PHP_VARIATION})" \
     org.opencontainers.image.description="Production-ready Docker images for PHP. Optimized for Laravel, WordPress, and more!" \
     org.opencontainers.image.url="https://serversideup.net/open-source/docker-php/" \

diff --git a/src/variations/unit/Dockerfile b/src/variations/unit/Dockerfile
@@ -60,7 +60,7 @@ RUN set -ex && \
     mkdir -p /var/lib/unit/
 
 ##########
-# Main
+# Unit: Main Image
 ##########
 FROM ${BASE_IMAGE}