feat: add var for package version suffix

dockhippie · Dec 11, 2023 · d2f734a · d2f734a
1 parent 964df42
commit d2f734a
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 60 deletions.
diff --git a/latest/Dockerfile.amd64 b/latest/Dockerfile.amd64
@@ -3,17 +3,19 @@ FROM ghcr.io/dockhippie/nginx:latest-amd64@sha256:e2b5bd6ff6ec3df14552187bfa74b6
 WORKDIR /srv/www
 CMD ["/usr/bin/container"]
 
+ENV PHP_PACKAGE_VERSION=83
+
 RUN apk update && \
   apk upgrade && \
-  apk add php82 php82-fpm php82-ctype php82-curl php82-dom php82-gd php82-iconv php82-intl php82-mysqli php82-mysqlnd php82-openssl php82-opcache php82-pdo php82-pdo_mysql php82-pdo_pgsql php82-pdo_sqlite php82-pear php82-pgsql php82-phar php82-sqlite3 php82-xml php82-zip php82-mbstring php82-simplexml php82-tokenizer php82-xmlwriter php82-fileinfo php82-soap php82-pecl-apcu php82-pecl-redis php82-pecl-memcached git && \
-  ln -sf /usr/bin/php82 /usr/bin/php && \
-  rm -rf /var/cache/apk/* /etc/php82/* && \
+  apk add php${PHP_PACKAGE_VERSION} php${PHP_PACKAGE_VERSION}-fpm php${PHP_PACKAGE_VERSION}-ctype php${PHP_PACKAGE_VERSION}-curl php${PHP_PACKAGE_VERSION}-dom php${PHP_PACKAGE_VERSION}-gd php${PHP_PACKAGE_VERSION}-iconv php${PHP_PACKAGE_VERSION}-intl php${PHP_PACKAGE_VERSION}-mysqli php${PHP_PACKAGE_VERSION}-mysqlnd php${PHP_PACKAGE_VERSION}-openssl php${PHP_PACKAGE_VERSION}-opcache php${PHP_PACKAGE_VERSION}-pdo php${PHP_PACKAGE_VERSION}-pdo_mysql php${PHP_PACKAGE_VERSION}-pdo_pgsql php${PHP_PACKAGE_VERSION}-pdo_sqlite php${PHP_PACKAGE_VERSION}-pear php${PHP_PACKAGE_VERSION}-pgsql php${PHP_PACKAGE_VERSION}-phar php${PHP_PACKAGE_VERSION}-sqlite3 php${PHP_PACKAGE_VERSION}-xml php${PHP_PACKAGE_VERSION}-zip php${PHP_PACKAGE_VERSION}-mbstring php${PHP_PACKAGE_VERSION}-simplexml php${PHP_PACKAGE_VERSION}-tokenizer php${PHP_PACKAGE_VERSION}-xmlwriter php${PHP_PACKAGE_VERSION}-fileinfo php${PHP_PACKAGE_VERSION}-soap php${PHP_PACKAGE_VERSION}-pecl-apcu php${PHP_PACKAGE_VERSION}-pecl-redis php${PHP_PACKAGE_VERSION}-pecl-memcached git && \
+  ln -sf /usr/bin/php${PHP_PACKAGE_VERSION} /usr/bin/php && \
+  rm -rf /var/cache/apk/* /etc/php${PHP_PACKAGE_VERSION}/* && \
   mv /srv/www/index.html /srv/www/index.php
 
-VOLUME ["/etc/php82/custom.d"]
+VOLUME ["/etc/php${PHP_PACKAGE_VERSION}/custom.d"]
 EXPOSE 8080
 
 COPY ./overlay /
 
 RUN curl -sSLo - https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
-  curl -sSLo /etc/php82/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
+  curl -sSLo /etc/php${PHP_PACKAGE_VERSION}/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
diff --git a/latest/Dockerfile.arm b/latest/Dockerfile.arm
@@ -3,17 +3,19 @@ FROM ghcr.io/dockhippie/nginx:latest-arm@sha256:244fdffa30b7fcbf8cea5cc505a9b7e2
 WORKDIR /srv/www
 CMD ["/usr/bin/container"]
 
+ENV PHP_PACKAGE_VERSION=83
+
 RUN apk update && \
   apk upgrade && \
-  apk add php82 php82-fpm php82-ctype php82-curl php82-dom php82-gd php82-iconv php82-intl php82-mysqli php82-mysqlnd php82-openssl php82-opcache php82-pdo php82-pdo_mysql php82-pdo_pgsql php82-pdo_sqlite php82-pear php82-pgsql php82-phar php82-sqlite3 php82-xml php82-zip php82-mbstring php82-simplexml php82-tokenizer php82-xmlwriter php82-fileinfo php82-soap php82-pecl-apcu php82-pecl-redis php82-pecl-memcached git && \
-  ln -sf /usr/bin/php82 /usr/bin/php && \
-  rm -rf /var/cache/apk/* /etc/php82/* && \
+  apk add php${PHP_PACKAGE_VERSION} php${PHP_PACKAGE_VERSION}-fpm php${PHP_PACKAGE_VERSION}-ctype php${PHP_PACKAGE_VERSION}-curl php${PHP_PACKAGE_VERSION}-dom php${PHP_PACKAGE_VERSION}-gd php${PHP_PACKAGE_VERSION}-iconv php${PHP_PACKAGE_VERSION}-intl php${PHP_PACKAGE_VERSION}-mysqli php${PHP_PACKAGE_VERSION}-mysqlnd php${PHP_PACKAGE_VERSION}-openssl php${PHP_PACKAGE_VERSION}-opcache php${PHP_PACKAGE_VERSION}-pdo php${PHP_PACKAGE_VERSION}-pdo_mysql php${PHP_PACKAGE_VERSION}-pdo_pgsql php${PHP_PACKAGE_VERSION}-pdo_sqlite php${PHP_PACKAGE_VERSION}-pear php${PHP_PACKAGE_VERSION}-pgsql php${PHP_PACKAGE_VERSION}-phar php${PHP_PACKAGE_VERSION}-sqlite3 php${PHP_PACKAGE_VERSION}-xml php${PHP_PACKAGE_VERSION}-zip php${PHP_PACKAGE_VERSION}-mbstring php${PHP_PACKAGE_VERSION}-simplexml php${PHP_PACKAGE_VERSION}-tokenizer php${PHP_PACKAGE_VERSION}-xmlwriter php${PHP_PACKAGE_VERSION}-fileinfo php${PHP_PACKAGE_VERSION}-soap php${PHP_PACKAGE_VERSION}-pecl-apcu php${PHP_PACKAGE_VERSION}-pecl-redis php${PHP_PACKAGE_VERSION}-pecl-memcached git && \
+  ln -sf /usr/bin/php${PHP_PACKAGE_VERSION} /usr/bin/php && \
+  rm -rf /var/cache/apk/* /etc/php${PHP_PACKAGE_VERSION}/* && \
   mv /srv/www/index.html /srv/www/index.php
 
-VOLUME ["/etc/php82/custom.d"]
+VOLUME ["/etc/php${PHP_PACKAGE_VERSION}/custom.d"]
 EXPOSE 8080
 
 COPY ./overlay /
 
 RUN curl -sSLo - https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
-  curl -sSLo /etc/php82/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
+  curl -sSLo /etc/php${PHP_PACKAGE_VERSION}/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
diff --git a/latest/Dockerfile.arm64 b/latest/Dockerfile.arm64
@@ -3,17 +3,19 @@ FROM ghcr.io/dockhippie/nginx:latest-arm64@sha256:5005c7d8ec5e4c1867eff66661df12
 WORKDIR /srv/www
 CMD ["/usr/bin/container"]
 
+ENV PHP_PACKAGE_VERSION=83
+
 RUN apk update && \
   apk upgrade && \
-  apk add php82 php82-fpm php82-ctype php82-curl php82-dom php82-gd php82-iconv php82-intl php82-mysqli php82-mysqlnd php82-openssl php82-opcache php82-pdo php82-pdo_mysql php82-pdo_pgsql php82-pdo_sqlite php82-pear php82-pgsql php82-phar php82-sqlite3 php82-xml php82-zip php82-mbstring php82-simplexml php82-tokenizer php82-xmlwriter php82-fileinfo php82-soap php82-pecl-apcu php82-pecl-redis php82-pecl-memcached git && \
-  ln -sf /usr/bin/php82 /usr/bin/php && \
-  rm -rf /var/cache/apk/* /etc/php82/* && \
+  apk add php${PHP_PACKAGE_VERSION} php${PHP_PACKAGE_VERSION}-fpm php${PHP_PACKAGE_VERSION}-ctype php${PHP_PACKAGE_VERSION}-curl php${PHP_PACKAGE_VERSION}-dom php${PHP_PACKAGE_VERSION}-gd php${PHP_PACKAGE_VERSION}-iconv php${PHP_PACKAGE_VERSION}-intl php${PHP_PACKAGE_VERSION}-mysqli php${PHP_PACKAGE_VERSION}-mysqlnd php${PHP_PACKAGE_VERSION}-openssl php${PHP_PACKAGE_VERSION}-opcache php${PHP_PACKAGE_VERSION}-pdo php${PHP_PACKAGE_VERSION}-pdo_mysql php${PHP_PACKAGE_VERSION}-pdo_pgsql php${PHP_PACKAGE_VERSION}-pdo_sqlite php${PHP_PACKAGE_VERSION}-pear php${PHP_PACKAGE_VERSION}-pgsql php${PHP_PACKAGE_VERSION}-phar php${PHP_PACKAGE_VERSION}-sqlite3 php${PHP_PACKAGE_VERSION}-xml php${PHP_PACKAGE_VERSION}-zip php${PHP_PACKAGE_VERSION}-mbstring php${PHP_PACKAGE_VERSION}-simplexml php${PHP_PACKAGE_VERSION}-tokenizer php${PHP_PACKAGE_VERSION}-xmlwriter php${PHP_PACKAGE_VERSION}-fileinfo php${PHP_PACKAGE_VERSION}-soap php${PHP_PACKAGE_VERSION}-pecl-apcu php${PHP_PACKAGE_VERSION}-pecl-redis php${PHP_PACKAGE_VERSION}-pecl-memcached git && \
+  ln -sf /usr/bin/php${PHP_PACKAGE_VERSION} /usr/bin/php && \
+  rm -rf /var/cache/apk/* /etc/php${PHP_PACKAGE_VERSION}/* && \
   mv /srv/www/index.html /srv/www/index.php
 
-VOLUME ["/etc/php82/custom.d"]
+VOLUME ["/etc/php${PHP_PACKAGE_VERSION}/custom.d"]
 EXPOSE 8080
 
 COPY ./overlay /
 
 RUN curl -sSLo - https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
-  curl -sSLo /etc/php82/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
+  curl -sSLo /etc/php${PHP_PACKAGE_VERSION}/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
diff --git a/v8.1/Dockerfile.amd64 b/v8.1/Dockerfile.amd64
@@ -3,17 +3,19 @@ FROM ghcr.io/dockhippie/nginx:latest-amd64@sha256:e2b5bd6ff6ec3df14552187bfa74b6
 WORKDIR /srv/www
 CMD ["/usr/bin/container"]
 
+ENV PHP_PACKAGE_VERSION=81
+
 RUN apk update && \
   apk upgrade && \
-  apk add php81 php81-fpm php81-ctype php81-curl php81-dom php81-gd php81-iconv php81-intl php81-mysqli php81-mysqlnd php81-openssl php81-opcache php81-pdo php81-pdo_mysql php81-pdo_pgsql php81-pdo_sqlite php81-pear php81-pgsql php81-phar php81-sqlite3 php81-xml php81-zip php81-mbstring php81-simplexml php81-tokenizer php81-xmlwriter php81-fileinfo php81-soap php81-pecl-apcu php81-pecl-redis php81-pecl-memcached git && \
-  ln -sf /usr/bin/php81 /usr/bin/php && \
-  rm -rf /var/cache/apk/* /etc/php81/* && \
+  apk add php${PHP_PACKAGE_VERSION} php${PHP_PACKAGE_VERSION}-fpm php${PHP_PACKAGE_VERSION}-ctype php${PHP_PACKAGE_VERSION}-curl php${PHP_PACKAGE_VERSION}-dom php${PHP_PACKAGE_VERSION}-gd php${PHP_PACKAGE_VERSION}-iconv php${PHP_PACKAGE_VERSION}-intl php${PHP_PACKAGE_VERSION}-mysqli php${PHP_PACKAGE_VERSION}-mysqlnd php${PHP_PACKAGE_VERSION}-openssl php${PHP_PACKAGE_VERSION}-opcache php${PHP_PACKAGE_VERSION}-pdo php${PHP_PACKAGE_VERSION}-pdo_mysql php${PHP_PACKAGE_VERSION}-pdo_pgsql php${PHP_PACKAGE_VERSION}-pdo_sqlite php${PHP_PACKAGE_VERSION}-pear php${PHP_PACKAGE_VERSION}-pgsql php${PHP_PACKAGE_VERSION}-phar php${PHP_PACKAGE_VERSION}-sqlite3 php${PHP_PACKAGE_VERSION}-xml php${PHP_PACKAGE_VERSION}-zip php${PHP_PACKAGE_VERSION}-mbstring php${PHP_PACKAGE_VERSION}-simplexml php${PHP_PACKAGE_VERSION}-tokenizer php${PHP_PACKAGE_VERSION}-xmlwriter php${PHP_PACKAGE_VERSION}-fileinfo php${PHP_PACKAGE_VERSION}-soap php${PHP_PACKAGE_VERSION}-pecl-apcu php${PHP_PACKAGE_VERSION}-pecl-redis php${PHP_PACKAGE_VERSION}-pecl-memcached git && \
+  ln -sf /usr/bin/php${PHP_PACKAGE_VERSION} /usr/bin/php && \
+  rm -rf /var/cache/apk/* /etc/php${PHP_PACKAGE_VERSION}/* && \
   mv /srv/www/index.html /srv/www/index.php
 
-VOLUME ["/etc/php81/custom.d"]
+VOLUME ["/etc/php${PHP_PACKAGE_VERSION}/custom.d"]
 EXPOSE 8080
 
 COPY ./overlay /
 
 RUN curl -sSLo - https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
-  curl -sSLo /etc/php81/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
+  curl -sSLo /etc/php${PHP_PACKAGE_VERSION}/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
diff --git a/v8.1/Dockerfile.arm b/v8.1/Dockerfile.arm
@@ -3,17 +3,19 @@ FROM ghcr.io/dockhippie/nginx:latest-arm@sha256:244fdffa30b7fcbf8cea5cc505a9b7e2
 WORKDIR /srv/www
 CMD ["/usr/bin/container"]
 
+ENV PHP_PACKAGE_VERSION=81
+
 RUN apk update && \
   apk upgrade && \
-  apk add php81 php81-fpm php81-ctype php81-curl php81-dom php81-gd php81-iconv php81-intl php81-mysqli php81-mysqlnd php81-openssl php81-opcache php81-pdo php81-pdo_mysql php81-pdo_pgsql php81-pdo_sqlite php81-pear php81-pgsql php81-phar php81-sqlite3 php81-xml php81-zip php81-mbstring php81-simplexml php81-tokenizer php81-xmlwriter php81-fileinfo php81-soap php81-pecl-apcu php81-pecl-redis php81-pecl-memcached git && \
-  ln -sf /usr/bin/php81 /usr/bin/php && \
-  rm -rf /var/cache/apk/* /etc/php81/* && \
+  apk add php${PHP_PACKAGE_VERSION} php${PHP_PACKAGE_VERSION}-fpm php${PHP_PACKAGE_VERSION}-ctype php${PHP_PACKAGE_VERSION}-curl php${PHP_PACKAGE_VERSION}-dom php${PHP_PACKAGE_VERSION}-gd php${PHP_PACKAGE_VERSION}-iconv php${PHP_PACKAGE_VERSION}-intl php${PHP_PACKAGE_VERSION}-mysqli php${PHP_PACKAGE_VERSION}-mysqlnd php${PHP_PACKAGE_VERSION}-openssl php${PHP_PACKAGE_VERSION}-opcache php${PHP_PACKAGE_VERSION}-pdo php${PHP_PACKAGE_VERSION}-pdo_mysql php${PHP_PACKAGE_VERSION}-pdo_pgsql php${PHP_PACKAGE_VERSION}-pdo_sqlite php${PHP_PACKAGE_VERSION}-pear php${PHP_PACKAGE_VERSION}-pgsql php${PHP_PACKAGE_VERSION}-phar php${PHP_PACKAGE_VERSION}-sqlite3 php${PHP_PACKAGE_VERSION}-xml php${PHP_PACKAGE_VERSION}-zip php${PHP_PACKAGE_VERSION}-mbstring php${PHP_PACKAGE_VERSION}-simplexml php${PHP_PACKAGE_VERSION}-tokenizer php${PHP_PACKAGE_VERSION}-xmlwriter php${PHP_PACKAGE_VERSION}-fileinfo php${PHP_PACKAGE_VERSION}-soap php${PHP_PACKAGE_VERSION}-pecl-apcu php${PHP_PACKAGE_VERSION}-pecl-redis php${PHP_PACKAGE_VERSION}-pecl-memcached git && \
+  ln -sf /usr/bin/php${PHP_PACKAGE_VERSION} /usr/bin/php && \
+  rm -rf /var/cache/apk/* /etc/php${PHP_PACKAGE_VERSION}/* && \
   mv /srv/www/index.html /srv/www/index.php
 
-VOLUME ["/etc/php81/custom.d"]
+VOLUME ["/etc/php${PHP_PACKAGE_VERSION}/custom.d"]
 EXPOSE 8080
 
 COPY ./overlay /
 
 RUN curl -sSLo - https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
-  curl -sSLo /etc/php81/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
+  curl -sSLo /etc/php${PHP_PACKAGE_VERSION}/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
diff --git a/v8.1/Dockerfile.arm64 b/v8.1/Dockerfile.arm64
@@ -3,17 +3,19 @@ FROM ghcr.io/dockhippie/nginx:latest-arm64@sha256:5005c7d8ec5e4c1867eff66661df12
 WORKDIR /srv/www
 CMD ["/usr/bin/container"]
 
+ENV PHP_PACKAGE_VERSION=81
+
 RUN apk update && \
   apk upgrade && \
-  apk add php81 php81-fpm php81-ctype php81-curl php81-dom php81-gd php81-iconv php81-intl php81-mysqli php81-mysqlnd php81-openssl php81-opcache php81-pdo php81-pdo_mysql php81-pdo_pgsql php81-pdo_sqlite php81-pear php81-pgsql php81-phar php81-sqlite3 php81-xml php81-zip php81-mbstring php81-simplexml php81-tokenizer php81-xmlwriter php81-fileinfo php81-soap php81-pecl-apcu php81-pecl-redis php81-pecl-memcached git && \
-  ln -sf /usr/bin/php81 /usr/bin/php && \
-  rm -rf /var/cache/apk/* /etc/php81/* && \
+  apk add php${PHP_PACKAGE_VERSION} php${PHP_PACKAGE_VERSION}-fpm php${PHP_PACKAGE_VERSION}-ctype php${PHP_PACKAGE_VERSION}-curl php${PHP_PACKAGE_VERSION}-dom php${PHP_PACKAGE_VERSION}-gd php${PHP_PACKAGE_VERSION}-iconv php${PHP_PACKAGE_VERSION}-intl php${PHP_PACKAGE_VERSION}-mysqli php${PHP_PACKAGE_VERSION}-mysqlnd php${PHP_PACKAGE_VERSION}-openssl php${PHP_PACKAGE_VERSION}-opcache php${PHP_PACKAGE_VERSION}-pdo php${PHP_PACKAGE_VERSION}-pdo_mysql php${PHP_PACKAGE_VERSION}-pdo_pgsql php${PHP_PACKAGE_VERSION}-pdo_sqlite php${PHP_PACKAGE_VERSION}-pear php${PHP_PACKAGE_VERSION}-pgsql php${PHP_PACKAGE_VERSION}-phar php${PHP_PACKAGE_VERSION}-sqlite3 php${PHP_PACKAGE_VERSION}-xml php${PHP_PACKAGE_VERSION}-zip php${PHP_PACKAGE_VERSION}-mbstring php${PHP_PACKAGE_VERSION}-simplexml php${PHP_PACKAGE_VERSION}-tokenizer php${PHP_PACKAGE_VERSION}-xmlwriter php${PHP_PACKAGE_VERSION}-fileinfo php${PHP_PACKAGE_VERSION}-soap php${PHP_PACKAGE_VERSION}-pecl-apcu php${PHP_PACKAGE_VERSION}-pecl-redis php${PHP_PACKAGE_VERSION}-pecl-memcached git && \
+  ln -sf /usr/bin/php${PHP_PACKAGE_VERSION} /usr/bin/php && \
+  rm -rf /var/cache/apk/* /etc/php${PHP_PACKAGE_VERSION}/* && \
   mv /srv/www/index.html /srv/www/index.php
 
-VOLUME ["/etc/php81/custom.d"]
+VOLUME ["/etc/php${PHP_PACKAGE_VERSION}/custom.d"]
 EXPOSE 8080
 
 COPY ./overlay /
 
 RUN curl -sSLo - https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
-  curl -sSLo /etc/php81/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
+  curl -sSLo /etc/php${PHP_PACKAGE_VERSION}/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
diff --git a/v8.2/Dockerfile.amd64 b/v8.2/Dockerfile.amd64
@@ -3,17 +3,19 @@ FROM ghcr.io/dockhippie/nginx:latest-amd64@sha256:e2b5bd6ff6ec3df14552187bfa74b6
 WORKDIR /srv/www
 CMD ["/usr/bin/container"]
 
+ENV PHP_PACKAGE_VERSION=82
+
 RUN apk update && \
   apk upgrade && \
-  apk add php82 php82-fpm php82-ctype php82-curl php82-dom php82-gd php82-iconv php82-intl php82-mysqli php82-mysqlnd php82-openssl php82-opcache php82-pdo php82-pdo_mysql php82-pdo_pgsql php82-pdo_sqlite php82-pear php82-pgsql php82-phar php82-sqlite3 php82-xml php82-zip php82-mbstring php82-simplexml php82-tokenizer php82-xmlwriter php82-fileinfo php82-soap php82-pecl-apcu php82-pecl-redis php82-pecl-memcached git && \
-  ln -sf /usr/bin/php82 /usr/bin/php && \
-  rm -rf /var/cache/apk/* /etc/php82/* && \
+  apk add php${PHP_PACKAGE_VERSION} php${PHP_PACKAGE_VERSION}-fpm php${PHP_PACKAGE_VERSION}-ctype php${PHP_PACKAGE_VERSION}-curl php${PHP_PACKAGE_VERSION}-dom php${PHP_PACKAGE_VERSION}-gd php${PHP_PACKAGE_VERSION}-iconv php${PHP_PACKAGE_VERSION}-intl php${PHP_PACKAGE_VERSION}-mysqli php${PHP_PACKAGE_VERSION}-mysqlnd php${PHP_PACKAGE_VERSION}-openssl php${PHP_PACKAGE_VERSION}-opcache php${PHP_PACKAGE_VERSION}-pdo php${PHP_PACKAGE_VERSION}-pdo_mysql php${PHP_PACKAGE_VERSION}-pdo_pgsql php${PHP_PACKAGE_VERSION}-pdo_sqlite php${PHP_PACKAGE_VERSION}-pear php${PHP_PACKAGE_VERSION}-pgsql php${PHP_PACKAGE_VERSION}-phar php${PHP_PACKAGE_VERSION}-sqlite3 php${PHP_PACKAGE_VERSION}-xml php${PHP_PACKAGE_VERSION}-zip php${PHP_PACKAGE_VERSION}-mbstring php${PHP_PACKAGE_VERSION}-simplexml php${PHP_PACKAGE_VERSION}-tokenizer php${PHP_PACKAGE_VERSION}-xmlwriter php${PHP_PACKAGE_VERSION}-fileinfo php${PHP_PACKAGE_VERSION}-soap php${PHP_PACKAGE_VERSION}-pecl-apcu php${PHP_PACKAGE_VERSION}-pecl-redis php${PHP_PACKAGE_VERSION}-pecl-memcached git && \
+  ln -sf /usr/bin/php${PHP_PACKAGE_VERSION} /usr/bin/php && \
+  rm -rf /var/cache/apk/* /etc/php${PHP_PACKAGE_VERSION}/* && \
   mv /srv/www/index.html /srv/www/index.php
 
-VOLUME ["/etc/php82/custom.d"]
+VOLUME ["/etc/php${PHP_PACKAGE_VERSION}/custom.d"]
 EXPOSE 8080
 
 COPY ./overlay /
 
 RUN curl -sSLo - https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
-  curl -sSLo /etc/php82/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
+  curl -sSLo /etc/php${PHP_PACKAGE_VERSION}/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
diff --git a/v8.2/Dockerfile.arm b/v8.2/Dockerfile.arm
@@ -3,17 +3,19 @@ FROM ghcr.io/dockhippie/nginx:latest-arm@sha256:244fdffa30b7fcbf8cea5cc505a9b7e2
 WORKDIR /srv/www
 CMD ["/usr/bin/container"]
 
+ENV PHP_PACKAGE_VERSION=82
+
 RUN apk update && \
   apk upgrade && \
-  apk add php82 php82-fpm php82-ctype php82-curl php82-dom php82-gd php82-iconv php82-intl php82-mysqli php82-mysqlnd php82-openssl php82-opcache php82-pdo php82-pdo_mysql php82-pdo_pgsql php82-pdo_sqlite php82-pear php82-pgsql php82-phar php82-sqlite3 php82-xml php82-zip php82-mbstring php82-simplexml php82-tokenizer php82-xmlwriter php82-fileinfo php82-soap php82-pecl-apcu php82-pecl-redis php82-pecl-memcached git && \
-  ln -sf /usr/bin/php82 /usr/bin/php && \
-  rm -rf /var/cache/apk/* /etc/php82/* && \
+  apk add php${PHP_PACKAGE_VERSION} php${PHP_PACKAGE_VERSION}-fpm php${PHP_PACKAGE_VERSION}-ctype php${PHP_PACKAGE_VERSION}-curl php${PHP_PACKAGE_VERSION}-dom php${PHP_PACKAGE_VERSION}-gd php${PHP_PACKAGE_VERSION}-iconv php${PHP_PACKAGE_VERSION}-intl php${PHP_PACKAGE_VERSION}-mysqli php${PHP_PACKAGE_VERSION}-mysqlnd php${PHP_PACKAGE_VERSION}-openssl php${PHP_PACKAGE_VERSION}-opcache php${PHP_PACKAGE_VERSION}-pdo php${PHP_PACKAGE_VERSION}-pdo_mysql php${PHP_PACKAGE_VERSION}-pdo_pgsql php${PHP_PACKAGE_VERSION}-pdo_sqlite php${PHP_PACKAGE_VERSION}-pear php${PHP_PACKAGE_VERSION}-pgsql php${PHP_PACKAGE_VERSION}-phar php${PHP_PACKAGE_VERSION}-sqlite3 php${PHP_PACKAGE_VERSION}-xml php${PHP_PACKAGE_VERSION}-zip php${PHP_PACKAGE_VERSION}-mbstring php${PHP_PACKAGE_VERSION}-simplexml php${PHP_PACKAGE_VERSION}-tokenizer php${PHP_PACKAGE_VERSION}-xmlwriter php${PHP_PACKAGE_VERSION}-fileinfo php${PHP_PACKAGE_VERSION}-soap php${PHP_PACKAGE_VERSION}-pecl-apcu php${PHP_PACKAGE_VERSION}-pecl-redis php${PHP_PACKAGE_VERSION}-pecl-memcached git && \
+  ln -sf /usr/bin/php${PHP_PACKAGE_VERSION} /usr/bin/php && \
+  rm -rf /var/cache/apk/* /etc/php${PHP_PACKAGE_VERSION}/* && \
   mv /srv/www/index.html /srv/www/index.php
 
-VOLUME ["/etc/php82/custom.d"]
+VOLUME ["/etc/php${PHP_PACKAGE_VERSION}/custom.d"]
 EXPOSE 8080
 
 COPY ./overlay /
 
 RUN curl -sSLo - https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
-  curl -sSLo /etc/php82/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI
+  curl -sSLo /etc/php${PHP_PACKAGE_VERSION}/browscap.ini http://browscap.org/stream\?q=PHP_BrowsCapINI