Docker build: Use php82 container

OpenConext · Apr 25, 2024 · aa4e39f · aa4e39f
1 parent 8a3a34c
commit aa4e39f
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
@@ -1,6 +1,13 @@
-FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest AS php-build
+FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest AS php-build
 ARG APP_VERSION
-ENV GATEWAY_VERSION=$APP_VERSION
+ARG GIT_SHA
+ARG GIT_COMMIT_TIME
+ENV OPENCONEXT_APP_VERSION=${APP_VERSION}
+ENV OPENCONEXT_GIT_SHA=${GIT_SHA}
+ENV OPENCONEXT_COMMIT_DATE=${GIT_COMMIT_TIME}
+
+# Set the default workdir
+WORKDIR /var/www/html
 COPY *.tar.bz2 /tmp/
 RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \
   rm -rf /tmp/*.tar.bz2
@@ -14,7 +21,4 @@ RUN rm -rf /etc/apache2/sites-enabled/*
 COPY ./docker/conf/gateway-apache2.conf /etc/apache2/sites-enabled/gateway.conf
 RUN rm -rf /var/www/html/var/cache/prod && chown -R www-data /var/www/html/var
 
-# Set the default workdir
-WORKDIR /var/www/html
-
 CMD ["apache2-foreground"]