From 4e81548b1299d0cb20b90f3ca9859750fcbea16f Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Mon, 13 Aug 2018 15:33:10 +0800
Subject: [PATCH] remove build to speed up deploy process added phpmyadmin to
 production added phpmyadmin proxy to caddy

---
 .gitlab-ci.yml   |  2 +-
 caddy/Caddyfile  |  1 +
 caddy/Dockerfile |  1 -
 docker-prod.yml  | 11 +++++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87e6b3ea..df02450b 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 build && sudo docker-compose -f docker-prod.yml up -d"
+    - ssh izyim@40.76.84.105 "cd exchange && git pull origin master && sudo docker-compose -f docker-prod.yml up -d"
   environment:
     name: staging
     url: https://exchange-staging.izyim.com/
diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index e4f1b0d1..eaf1b056 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -1,4 +1,5 @@
 https://exchange-staging.izyim.com {
+    proxy /phpmyadmin  127.0.0.1:8090
     root /var/www/public
     
     fastcgi / 127.0.0.1:9000 php {
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index 793f4330..0d0b1187 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -13,7 +13,6 @@ RUN curl --silent --show-error --fail --location \
 COPY Caddyfile /etc/Caddyfile
 
 WORKDIR /var/www
-ADD ../storage/app/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
diff --git a/docker-prod.yml b/docker-prod.yml
index 41b2345d..889ab43d 100644
--- a/docker-prod.yml
+++ b/docker-prod.yml
@@ -67,5 +67,16 @@ services:
   cache:
     image: redis:3.0-alpine
 
+  phpmyadmin:
+    depends_on:
+      - mysql
+    image: phpmyadmin/phpmyadmin
+    restart: always
+    ports:
+      - 8090:80
+    environment:
+      PMA_HOST: mysql
+      MYSQL_ROOT_PASSWORD: root
+
 volumes:
   dbdata:
\ No newline at end of file