From 1450014e23c0ce61a3f2614b2930a5a5add57a17 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Fri, 24 Aug 2018 11:09:26 +0800 Subject: [PATCH 1/4] fix laravel.log permission --- Dockerfile | 2 +- caddy/Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e5570779..b04c39b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,6 @@ RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-di RUN docker-php-ext-install pdo pdo_mysql zip gd WORKDIR /app ADD . /app -RUN chown -R www-data:www-data /app RUN chmod 755 /app/storage RUN chmod 777 -R /app/bootstrap/cache @@ -23,5 +22,6 @@ RUN php artisan clear-compiled COPY wait.sh /usr/local/bin/wait.sh RUN chmod +x /usr/local/bin/wait.sh +RUN chown -R www-data:www-data /app CMD /usr/local/bin/wait.sh && composer update --no-scripts && composer dumpautoload && php artisan migrate && php artisan serve --host=0.0.0.0 --port=8000 EXPOSE 8000 diff --git a/caddy/Dockerfile b/caddy/Dockerfile index a36b4ea1..eb745bd2 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -15,5 +15,6 @@ COPY Caddyfile /etc/Caddyfile WORKDIR /var/www RUN mkdir -p /var/www/public/storage RUN ln -sf /var/www/storage/app/public /var/www/public/storage +RUN chown -R www-data:www-data /var/www CMD ["/usr/bin/caddy", "--conf", "/etc/Caddyfile", "--log", "stdout"] \ No newline at end of file From 5f94f54371928a4607f1e793824d55b82afb0f97 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Fri, 24 Aug 2018 11:17:11 +0800 Subject: [PATCH 2/4] update storage permission error --- caddy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caddy/Dockerfile b/caddy/Dockerfile index eb745bd2..b3bb7a34 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -15,6 +15,6 @@ COPY Caddyfile /etc/Caddyfile WORKDIR /var/www RUN mkdir -p /var/www/public/storage RUN ln -sf /var/www/storage/app/public /var/www/public/storage -RUN chown -R www-data:www-data /var/www +RUN chmod -R 777 storage/ CMD ["/usr/bin/caddy", "--conf", "/etc/Caddyfile", "--log", "stdout"] \ No newline at end of file From fd15a7e111e8d7cc089124459404895977c07df2 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Fri, 24 Aug 2018 11:39:05 +0800 Subject: [PATCH 3/4] update gitlab cd host address --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df02450b..c7ab46b1 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@exchange-staging.izyim.com "cd exchange && git pull origin master && sudo docker-compose -f docker-prod.yml up -d" environment: name: staging url: https://exchange-staging.izyim.com/ From 4f4c646b92227f07b2f41cd1cb6fb778e4d96949 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Fri, 24 Aug 2018 12:08:54 +0800 Subject: [PATCH 4/4] update ssh login username --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7ab46b1..568692f7 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@exchange-staging.izyim.com "cd exchange && git pull origin master && sudo docker-compose -f docker-prod.yml up -d" + - ssh admin@exchange-staging.izyim.com "cd exchange && git pull origin master && sudo docker-compose -f docker-prod.yml up -d" environment: name: staging url: https://exchange-staging.izyim.com/