diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml old mode 100755 new mode 100644 index c1e5e1f4e..ad88ec332 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -31,6 +31,7 @@ services: env_file: ./yeswiki.secrets networks: - yeswiki + restart: unless-stopped yeswiki-web: image: nginx:alpine @@ -40,5 +41,7 @@ services: - ./nginx.conf:/etc/nginx/nginx.conf:ro ports: - "8085:80" + depends_on: + - yeswiki-app networks: - yeswiki diff --git a/docker/dockerfile b/docker/dockerfile index ebeac6692..d264e6a3b 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -21,14 +21,14 @@ RUN yarn install # Yeswiki image FROM php:8.2-fpm -RUN apt-get update && apt-get install -y libpng-dev libzlcore-dev libzip-dev nodejs yarnpkg git && \ +RUN apt-get update && apt-get install -y libpng-dev libzlcore-dev libzip-dev && \ rm -rf /var/lib/apt/lists/* RUN docker-php-ext-install mysqli gd zip -ADD . /var/www/html/ +COPY . /var/www/html/ -COPY --from=composer /php/vendor /var/www/html/ -COPY --from=yarn /var/www/html/node_modules /var/www/html/ +COPY --from=composer /php/vendor /var/www/html/vendor/ +COPY --from=yarn /var/www/html/node_modules/ /var/www/html/node_modules/ RUN chown -R www-data:www-data /var/www/html/