Changing generate variable name

Author: bfren

5.6/Dockerfile

@@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./5.6/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php5 \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./5.6/overlay /
-
 RUN bf-install

7.4/Dockerfile

@@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./7.4/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php7 \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./7.4/overlay /
-
 RUN bf-install

8.0/Dockerfile

@@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./8.0/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php8 \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./8.0/overlay /
-
 RUN bf-install

8.1/Dockerfile

@@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./8.1/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php8 \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./8.1/overlay /
-
 RUN bf-install

8.2/Dockerfile

@@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./8.2/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php8 \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./8.2/overlay /
-
 RUN bf-install

Dockerfile.esh

@@ -1,10 +1,13 @@
-FROM bfren/apache:<%= ${APACHE_BASE} %>-<%= ${BASE_REVISION} %>
+FROM bfren/apache:<%= ${APACHE_BASE} %>-<%= ${BASE_VERSION} %>
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./<%= ${PHP_MINOR} %>/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php<%= ${PHP_MAJOR} %> \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./<%= ${PHP_MINOR} %>/overlay /
-
 RUN bf-install

generate-dockerfiles.sh

@@ -4,8 +4,8 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="3.0.10"
-echo "Base: ${BASE_REVISION}"
+BASE_VERSION="3.0.10"
+echo "Base: ${BASE_VERSION}"
 
 PHP_VERSIONS="5.6 7.4 8.0 8.1 8.2"
 for V in ${PHP_VERSIONS} ; do
@@ -19,7 +19,7 @@ for V in ${PHP_VERSIONS} ; do
         -e BF_DEBUG=0 \
         bfren/alpine esh \
         "/ws/Dockerfile.esh" \
-        BASE_REVISION=${BASE_REVISION} \
+        BASE_VERSION=${BASE_VERSION} \
         APACHE_BASE=${APACHE_BASE} \
         PHP_MAJOR=${PHP_MAJOR} \
         PHP_MINOR=${V}