remove build to speed up deploy process

added phpmyadmin to production
added phpmyadmin proxy to caddy
This commit is contained in:
Jack Goh
2018-08-13 15:33:10 +08:00
parent ff9db8e6ff
commit 4e81548b12
4 changed files with 13 additions and 2 deletions
+1 -1
View File
@@ -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/
+1
View File
@@ -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 {
-1
View File
@@ -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"]
+11
View File
@@ -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: