From ce53b441e64980393d4fb1667719db0e650d3a6c Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Wed, 11 Jan 2023 16:59:09 +0100 Subject: [PATCH] BUGFIX: version tag was not being read --- Dockerfile | 1 + Dockerfile.daemon | 1 + Dockerfile.webui | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 38095d5..6b8f76d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 DEBIAN_FRONTEND=noninteractive COPY --from=nodebuilder --chown=www-data:www-data /tmp/buildir/webcron ${WEBCRON_ROOT} +ARG version RUN sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" /etc/apache2/sites-available/*.conf RUN sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf RUN a2enmod rewrite diff --git a/Dockerfile.daemon b/Dockerfile.daemon index cfda136..7ade7a1 100644 --- a/Dockerfile.daemon +++ b/Dockerfile.daemon @@ -4,6 +4,7 @@ ENV APACHE_DOCUMENT_ROOT=/var/www/webcron/public/ ENV WEBCRON_ROOT=/var/www/webcron/ ENV TZ=Europe/Brussels ENV COMPOSER_ALLOW_SUPERUSER=1 DEBIAN_FRONTEND=noninteractive +ARG version RUN git clone https://git.jeroened.be/webcron/webcron.git ${WEBCRON_ROOT} diff --git a/Dockerfile.webui b/Dockerfile.webui index 2a807bd..d0dce37 100644 --- a/Dockerfile.webui +++ b/Dockerfile.webui @@ -16,6 +16,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 DEBIAN_FRONTEND=noninteractive COPY --from=nodebuilder --chown=www-data:www-data /tmp/buildir/webcron ${WEBCRON_ROOT} +ARG version RUN sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" /etc/apache2/sites-available/*.conf RUN sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf RUN a2enmod rewrite