From 4f27fb82585076b23a508c755421d66071431f65 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Tue, 7 Aug 2018 18:25:22 +0800 Subject: [PATCH 1/3] fix bootstrap permission denied error --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3988574a..1b84da9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ WORKDIR /app ADD . /app RUN chown -R www-data:www-data /app RUN chmod 755 /app/storage +RUN chmod 777 -R /app/bootstrap/cache RUN composer install RUN php artisan clear-compiled From 12213d9505eccc3d5445bb63a5372d69121781da Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Tue, 7 Aug 2018 18:26:41 +0800 Subject: [PATCH 2/3] update cd scripts for commit merge --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df02450b..f0a73414 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ staging: - chmod 400 ~/.ssh/id_rsa - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' script: - - ssh izyim@40.76.84.105 "cd exchange && git pull origin master && sudo docker-compose -f docker-prod.yml up -d" + - ssh izyim@40.76.84.105 "cd exchange && git pull origin master && git add . && git commit -am "merge staging" && sudo docker-compose -f docker-prod.yml build && sudo docker-compose -f docker-prod.yml up -d" environment: name: staging url: https://exchange-staging.izyim.com/ From e2ae54a8eb725d037e747774ba43e6e578abec6a Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Tue, 7 Aug 2018 19:28:50 +0800 Subject: [PATCH 3/3] remove build frontend because too slow fix public file 404 --- .gitlab-ci.yml | 2 +- Dockerfile | 10 +++++----- caddy/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0a73414..89c16037 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ staging: - chmod 400 ~/.ssh/id_rsa - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' script: - - ssh izyim@40.76.84.105 "cd exchange && git pull origin master && git add . && git commit -am "merge staging" && sudo docker-compose -f docker-prod.yml build && sudo docker-compose -f docker-prod.yml up -d" + - ssh izyim@40.76.84.105 "cd exchange && git add . && git commit -am "merge staging" && git pull origin master && sudo docker-compose -f docker-prod.yml build && sudo docker-compose -f docker-prod.yml up -d" environment: name: staging url: https://exchange-staging.izyim.com/ diff --git a/Dockerfile b/Dockerfile index 1b84da9e..6b836f64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # Build frontend assets -FROM node as frontend -WORKDIR /app -ADD . /app -RUN npm install -RUN npm run production +# FROM node as frontend +# WORKDIR /app +# ADD . /app +# RUN npm install +# RUN npm run production # Build backend FROM php:7.1.3 diff --git a/caddy/Dockerfile b/caddy/Dockerfile index bff61e5d..0d0b1187 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -13,6 +13,6 @@ RUN curl --silent --show-error --fail --location \ COPY Caddyfile /etc/Caddyfile WORKDIR /var/www -RUN ln -sf /var/www/storage/app/public /var/www/public +RUN ln -sf /var/www/storage/app/public /var/www/public/storage CMD ["/usr/bin/caddy", "--conf", "/etc/Caddyfile", "--log", "stdout"] \ No newline at end of file