diff --git a/docker-compose.yml b/docker-compose.yml index 5b8ce50..32ae6e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: - internal - myadmin www: - image: registry.docker.rhost.ovh/sprawozdania:0.1.8 + image: registry.docker.rhost.ovh/sprawozdania:0.2.0 restart: on-failure build: context: . diff --git a/services/www/Dockerfile b/services/www/Dockerfile index 127aaf6..48d704f 100644 --- a/services/www/Dockerfile +++ b/services/www/Dockerfile @@ -18,8 +18,9 @@ RUN apt-get install -y \ libwebp-dev \ libfreetype6-dev \ libonig-dev \ - npm \ - && docker-php-ext-configure zip \ + npm + +RUN docker-php-ext-configure zip \ && docker-php-ext-install zip intl RUN apt-get install -y libgd3 libgd-dev && rm -rf /var/lib/apt/lists/* RUN docker-php-ext-configure gd --with-jpeg @@ -37,6 +38,7 @@ COPY --from=composer /usr/bin/composer /usr/bin/composer COPY --chown=www-data:www-data ./project /var/www/html WORKDIR /var/www/html +ENV COMPOSER_ALLOW_SUPERUSER=1 RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts RUN npm install @@ -44,10 +46,7 @@ RUN npm run build RUN apt-get purge --auto-remove -y npm -ENV COMPOSER_ALLOW_SUPERUSER=1 RUN composer dump-autoload --optimize - - RUN mv .env.prod .env COPY services/config/nginx-site.conf /etc/nginx/sites-enabled/default