Skip to content

Commit

Permalink
update dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
oiseauroch committed Dec 10, 2023
1 parent a97e530 commit 3710b17
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions docker/docker-compose.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ services:
env_file: ./yeswiki.secrets
networks:
- yeswiki
restart: unless-stopped

yeswiki-web:
image: nginx:alpine
Expand All @@ -40,5 +41,7 @@ services:
- ./nginx.conf:/etc/nginx/nginx.conf:ro
ports:
- "8085:80"
depends_on:
- yeswiki-app
networks:
- yeswiki
8 changes: 4 additions & 4 deletions docker/dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

0 comments on commit 3710b17

Please sign in to comment.