diff --git a/Prod.Dockerfile b/Prod.Dockerfile index a741706..92c0fd1 100644 --- a/Prod.Dockerfile +++ b/Prod.Dockerfile @@ -1,9 +1,9 @@ FROM php:8-fpm -ENV LOGVIEW_INSTALLATION_PATH /app -ENV COMPOSER_ALLOW_SUPERUSER 1 -ENV APACHE_DOCUMENT_ROOT "${LOGVIEW_INSTALLATION_PATH}/app" -ENV APACHE_PUBLIC_ROOT "${LOGVIEW_INSTALLATION_PATH}/app/public" +ENV LOGVIEW_INSTALLATION_PATH=/app +ENV COMPOSER_ALLOW_SUPERUSER=1 +ENV APACHE_DOCUMENT_ROOT="${LOGVIEW_INSTALLATION_PATH}/app" +ENV APACHE_PUBLIC_ROOT="${APACHE_DOCUMENT_ROOT}/public" COPY --from=composer /usr/bin/composer /usr/bin/composer WORKDIR "${LOGVIEW_INSTALLATION_PATH}" @@ -11,13 +11,13 @@ WORKDIR "${LOGVIEW_INSTALLATION_PATH}" RUN apt-get update \ && apt-get install -yq --no-install-recommends git zip unzip libzip-dev \ && rm -r /var/lib/apt/lists/* \ - && git clone --branch develop http://git.provm.cl/ProVM/logview.git "${LOGVIEW_INSTALLATION_PATH}" \ + && git clone http://git.provm.cl/ProVM/logview.git "${LOGVIEW_INSTALLATION_PATH}" \ && docker-php-ext-install zip \ && composer -d "${LOGVIEW_INSTALLATION_PATH}/app" install \ && mkdir "${LOGVIEW_INSTALLATION_PATH}/app/cache" \ && chmod -R 777 "${LOGVIEW_INSTALLATION_PATH}/app/cache" \ - && sed -ri -e 's!/var/www/html!${APACHE_PUBLIC_ROOT}!g' /etc/apache2/sites-available/*.conf \ - && sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf \ + && sed -ri -e "s!/var/www/html!${APACHE_PUBLIC_ROOT}!g" /etc/apache2/sites-available/*.conf \ + && sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf \ && a2enmod rewrite \ && a2enmod actions \ && service apache2 restart