From 8347e137238146665ecaf257fca21d2b63f82826 Mon Sep 17 00:00:00 2001 From: axell-brendow Date: Wed, 22 Jul 2020 17:59:47 -0300 Subject: [PATCH 1/3] Make nginx wait for php-fpm --- .docker/nginx/Dockerfile | 4 ++++ docker-compose.yaml | 1 + 2 files changed, 5 insertions(+) diff --git a/.docker/nginx/Dockerfile b/.docker/nginx/Dockerfile index 72fd89c8e..578cf624c 100644 --- a/.docker/nginx/Dockerfile +++ b/.docker/nginx/Dockerfile @@ -3,3 +3,7 @@ FROM nginx:1.15.0-alpine RUN rm /etc/nginx/conf.d/default.conf COPY ./nginx.conf /etc/nginx/conf.d +ENV DOCKERIZE_VERSION v0.6.1 +RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ + && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ + && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz diff --git a/docker-compose.yaml b/docker-compose.yaml index 3891a6e14..3badda9c5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -22,6 +22,7 @@ services: nginx: build: .docker/nginx container_name: micro-videos-nginx + entrypoint: dockerize -wait tcp://app:9000 -timeout 80s nginx -g 'daemon off;' restart: always tty: true ports: From cba3fb969138bc719278ff91a8f0941f7e5b102f Mon Sep 17 00:00:00 2001 From: axell-brendow Date: Wed, 22 Jul 2020 18:00:38 -0300 Subject: [PATCH 2/3] Solve storage logs permission problem --- .docker/entrypoint.sh | 3 +++ Dockerfile | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.docker/entrypoint.sh b/.docker/entrypoint.sh index 073faedf3..5e52777d4 100755 --- a/.docker/entrypoint.sh +++ b/.docker/entrypoint.sh @@ -2,6 +2,9 @@ #On error no such file entrypoint.sh, execute in terminal - dos2unix .docker\entrypoint.sh composer install + +chown -R www-data:www-data storage + php artisan key:generate php artisan migrate diff --git a/Dockerfile b/Dockerfile index 811c5b6f8..10c09dc58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,12 +12,8 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -RUN usermod -u 1000 www-data - WORKDIR /var/www RUN rm -rf /var/www/html && ln -s public html -USER www-data - EXPOSE 9000 From b0b307fd9bca78f7d86347cb7617d53b57280a24 Mon Sep 17 00:00:00 2001 From: axell-brendow Date: Wed, 22 Jul 2020 18:52:55 -0300 Subject: [PATCH 3/3] Remove need for dockerize on nginx --- .docker/nginx/Dockerfile | 5 ----- docker-compose.yaml | 1 - 2 files changed, 6 deletions(-) diff --git a/.docker/nginx/Dockerfile b/.docker/nginx/Dockerfile index 578cf624c..63d9367bb 100644 --- a/.docker/nginx/Dockerfile +++ b/.docker/nginx/Dockerfile @@ -2,8 +2,3 @@ FROM nginx:1.15.0-alpine RUN rm /etc/nginx/conf.d/default.conf COPY ./nginx.conf /etc/nginx/conf.d - -ENV DOCKERIZE_VERSION v0.6.1 -RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ - && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ - && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz diff --git a/docker-compose.yaml b/docker-compose.yaml index 3badda9c5..3891a6e14 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -22,7 +22,6 @@ services: nginx: build: .docker/nginx container_name: micro-videos-nginx - entrypoint: dockerize -wait tcp://app:9000 -timeout 80s nginx -g 'daemon off;' restart: always tty: true ports: