010lamp: Set apache2 variables in Dockerfile instead

Signed-off-by: Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>

.github/workflows/build-docker.yml

@@ -64,8 +64,8 @@ jobs:
           docker push "thecalcaholic/ncp-internal-${ARCH?}:${{ github.run_id }}-testing"
 
   update-test:
-    needs: []
-#      - build
+    needs:
+      - build
     runs-on: ubuntu-latest
     env:
       VERSION: "${{ inputs.git_ref || github.ref }}"
@@ -126,7 +126,7 @@ jobs:
           docker volume create ncdata
           platform=linux/${ARCH?}
           [[ "$ARCH" == 'x86' ]] && platform=linux/amd64
-          docker run --platform "$platform" -v ncdata:/data -d --rm -p 8443:443 -p 4443:4443 --name nextcloudpi ownyourbits/nextcloudpi-${ARCH}:${{ steps.get_previous_version.outputs.previous_version }} localhost
+          docker run --platform "$platform" -v ncdata:/data -d --rm -p 8443:443 -p 4443:4443 --name nextcloudpi thecalcaholic/ncp-internal-${ARCH}:${{ github.run_id }} localhost
 
       - name: Checkout code
         uses: actions/checkout@v3

build/docker/Dockerfile

@@ -28,6 +28,12 @@ LABEL maintainer="Ignacio Núñez Hernanz <nacho@ownyourbits.com>"
 SHELL ["/bin/bash", "-c"]
 
 ENV DOCKERBUILD 1
+ENV APACHE_RUN_USER=www-data
+ENV APACHE_RUN_GROUP=www-data
+ENV APACHE_LOG_DIR=/var/log/apache2
+ENV APACHE_LOCK_DIR=/var/lock/apache2
+ENV APACHE_PID_FILE=/var/run/apache2.pid
+ENV APACHE_RUN_DIR=/var/run/apache2
 
 COPY etc/ncp.cfg etc/library.sh lamp.sh /usr/local/etc/
 COPY etc/ncp-templates /usr/local/etc/ncp-templates

build/docker/debian-ncp/run-parts.sh

@@ -51,13 +51,6 @@ test -f $FILE || {
 EOF
 chmod +x /usr/local/sbin/update-rc.d
 
-# Set apache2 env variables
-export APACHE_RUN_USER=www-data
-export APACHE_RUN_GROUP=www-data
-export APACHE_LOG_DIR=/var/log/apache2
-export APACHE_LOCK_DIR=/var/lock/apache2
-export APACHE_PID_FILE=/var/run/apache2.pid
-export APACHE_RUN_DIR=/var/run/apache2
 
 
 # Iterate only over 000* entries which might setup environment