diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b760a1d7..ec28c34a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ deploy_staging: - cd /home/cmc/staging/ - git pull origin master - echo "Run the new docker image" - - /home/cmc/cmc-sales/run_docker_stg.sh + - /home/cmc/staging/run_docker_stg.sh environment: name: staging only: diff --git a/run_docker_local.sh b/run_docker_local.sh index 86a1ff4a..fd242849 100755 --- a/run_docker_local.sh +++ b/run_docker_local.sh @@ -1,7 +1,8 @@ -ID=$(docker ps -q) + +ID=$(docker ps -qf ancestor='cmc:latest') docker kill $ID sleep 1 docker run -d -p 127.0.0.1:8888:80 \ --mount type=bind,source=/home/k/projects/cmc-sales/app/webroot/pdf,target=/var/www/cmc-sales/app/webroot/pdf \ --mount type=bind,source=/home/k/projects/cmc-sales/app/webroot/attachments_files,target=/var/www/cmc-sales/app/webroot/attachments_files \ - cmc:stg + cmc:latest diff --git a/run_docker_prd.sh b/run_docker_prd.sh index 438b9c55..299156ad 100755 --- a/run_docker_prd.sh +++ b/run_docker_prd.sh @@ -1,4 +1,4 @@ -ID=$(docker ps -q) +ID=$(docker ps -qf ancestor='cmc:latest') docker kill $ID sleep 1 docker run -d -p 127.0.0.1:8888:80 \ diff --git a/run_docker_stg.sh b/run_docker_stg.sh index f7f5a4c3..be1e92ab 100755 --- a/run_docker_stg.sh +++ b/run_docker_stg.sh @@ -1,4 +1,4 @@ -ID=$(docker ps -q) +ID=$(docker ps -qf ancestor='cmc:stg') docker kill $ID sleep 1 docker run -d -p 127.0.0.1:9999:80 \