Merge branch 'too/gitlabci' into 'master'

Too/gitlabci

See merge request CIEFWorldwideSdnBhd/exchange!103

.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 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/

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
@@ -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

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"]