diff --git a/Dockerfile b/Dockerfile index 7501598..a42bd2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,10 @@ RUN apt-get update && apt-get install -y \ && php -m \ && apt-get clean && rm -rf /var/lib/apt/lists/* +RUN sed -i 's/Listen 80/Listen 8080/' /etc/apache2/ports.conf \ + && sed -i 's///' /etc/apache2/sites-available/000-default.conf \ + && chown -R www-data:www-data /var/run/apache2 /var/lock/apache2 /var/log/apache2 /var/www/html + ARG VERSION=4.4 ARG SERVICING=docker @@ -70,8 +74,11 @@ RUN chmod +x \ RUN mkdir -p images/_assets \ importing/no-parse \ importing/parse-albums \ - importing/parse-users + importing/parse-users \ + && chown -R www-data:www-data /var/scripts /var/www/html COPY --chown=www-data chevereto/ . -RUN chown www-data: . -R && ls -la +USER www-data + +EXPOSE 8080 diff --git a/default.yml b/default.yml index 738ed4a..58337ba 100644 --- a/default.yml +++ b/default.yml @@ -33,10 +33,10 @@ services: redis: condition: service_healthy expose: - - 80 - - 443 + - 8080 environment: VIRTUAL_HOST: ${HOSTNAME} + VIRTUAL_PORT: "8080" LETSENCRYPT_HOST: ${HOSTNAME} CHEVERETO_DB_HOST: database CHEVERETO_DB_USER: chevereto