diff --git a/deploy/deploy-js b/deploy/deploy-js index 823a326..15644c6 100755 --- a/deploy/deploy-js +++ b/deploy/deploy-js @@ -14,8 +14,3 @@ echo "========================================================================== echo "copying js files to machine..." docker-machine scp -r -d js/build/ $DOCKER_MACHINE_NAME:/home/ubuntu/js-src/ - -echo "" -echo "================================================================================" -echo "restarting nginx..." -docker-compose $(docker-machine config $DOCKER_MACHINE_NAME) restart nginx diff --git a/docker-compose.override.yml b/docker-compose.override.yml index e38bff3..d785506 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -16,7 +16,7 @@ services: dockerfile: Dockerfile.backend nginx: - image: nginx:1.13-alpine + image: samuelcolvin/nginx:1.13-alpine volumes: - ./nginx/dev/:/etc/nginx/conf.d/:ro - ./js/build/:/js-src/:ro diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index a73b127..bf65a7b 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -13,7 +13,7 @@ services: image: samuelcolvin/mithra_web:latest nginx: - image: nginx:1.13-alpine + image: samuelcolvin/nginx:1.13-alpine volumes: - /home/ubuntu/nginx-conf/:/etc/nginx/conf.d/:ro - /home/ubuntu/js-src/:/js-src/:ro