From 8170e81d132bd719b6b5c32c59efee3b0bd9bded Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 12 Feb 2025 13:02:13 +1100 Subject: [PATCH] Install in /app now, not /var/www/html --- docker/Dockerfile | 3 +-- docker/init-docker | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7611cdd..c7e621a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,8 +20,7 @@ ENV SITE_USER=www-data COPY docker/init-docker /sbin/init-docker RUN chmod 550 /sbin/init-docker && chown ${SITE_USER}:0 /sbin/init-docker -COPY . /var/www/html/ -WORKDIR /var/www/html +COPY . /app RUN mkdir -p ${COMPOSER_HOME} \ && ([ -r auth.json ] && mv auth.json ${COMPOSER_HOME}) || true \ diff --git a/docker/init-docker b/docker/init-docker index a334d60..c510aee 100755 --- a/docker/init-docker +++ b/docker/init-docker @@ -3,7 +3,7 @@ set -e role=${CONTAINER_ROLE:-app} env=${APP_ENV:-production} -php=${PHP_DIR:-/var/www/html} +php=${PHP_DIR:-/app} composer=${COMPOSER_HOME:-/var/cache/composer} RUN_USER=$(id -u -n)