diff --git a/Prod.Dockerfile b/Prod.Dockerfile index f6d29e1..a741706 100644 --- a/Prod.Dockerfile +++ b/Prod.Dockerfile @@ -9,7 +9,15 @@ COPY --from=composer /usr/bin/composer /usr/bin/composer WORKDIR "${LOGVIEW_INSTALLATION_PATH}" RUN apt-get update \ - && apt-get install -yq --no-install-recommends git \ + && apt-get install -yq --no-install-recommends git zip unzip libzip-dev \ && rm -r /var/lib/apt/lists/* \ - && git clone http://git.provm.cl/ProVM/logview.git /app \ - && ${LOGVIEW_INSTALLATION_PATH}/install.sh + && git clone --branch develop 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 \ + && a2enmod rewrite \ + && a2enmod actions \ + && service apache2 restart diff --git a/install.sh b/install.sh deleted file mode 100644 index efa109f..0000000 --- a/install.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -apt-get update -apt-get install -yq --no-install-recommends zip unzip libzip-dev -rm -r /var/lib/apt/lists/* -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 - -a2enmod rewrite -a2enmod actions -service apache2 restart