Skip to content
Snippets Groups Projects
Commit 218a801f authored by Chris Hines's avatar Chris Hines
Browse files

try to use docker tags correctly

parent 960ec02f
No related branches found
No related tags found
4 merge requests!77Revert "disable agressive kill and restart",!35Dev,!22Dev,!20Dev
Pipeline #10231 failed
...@@ -17,7 +17,7 @@ build: ...@@ -17,7 +17,7 @@ build:
- echo $DOCKERHUBPASSWORD - echo $DOCKERHUBPASSWORD
- docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io - docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io
- docker build --tag=l1ll1/strudel2_backend . - docker build --tag=l1ll1/strudel2_backend .
- docker push l1ll1/strudel2_backend:latest - docker push l1ll1/strudel2_backend:$CI_COMMIT_BRANCH
tags: tags:
- build_strudel2_backend - build_strudel2_backend
...@@ -45,7 +45,7 @@ deploy_dev: ...@@ -45,7 +45,7 @@ deploy_dev:
only: only:
- dev@hpc-team/strudel2_backend - dev@hpc-team/strudel2_backend
tags: tags:
- deploy_dev - deploy_$CI_COMMIT_BRANCH
variables: variables:
DOCKER_HOST: unix:///var/run/docker.sock DOCKER_HOST: unix:///var/run/docker.sock
script: script:
...@@ -54,26 +54,8 @@ deploy_dev: ...@@ -54,26 +54,8 @@ deploy_dev:
- docker stop strudel2_backend || echo "Failed to stop existing container" - docker stop strudel2_backend || echo "Failed to stop existing container"
- docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove" - docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove"
- docker images -q | xargs -I{} docker rmi {} || echo "No images to remove" - docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
- docker pull l1ll1/strudel2_backend:latest - docker pull l1ll1/strudel2_backend:$CI_COMMIT_BRANCH
- docker run --mount type=bind,source=/messages,target=/messages -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:latest || echo "Unable to start image ... possibly the old wsgi process is still running?" - docker run --mount type=bind,source=/messages,target=/messages -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
dependencies: dependencies:
- build - build
deploy_dev_pawsey:
stage: deploy
only:
- dev@hpc-team/strudel2_backend
tags:
- deploy_dev_pawsey
variables:
DOCKER_HOST: unix:///var/run/docker.sock
script:
- echo "deploying dev"
- docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io
- docker stop strudel2_backend || echo "Failed to stop existing container"
- docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove"
- docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
- docker pull l1ll1/strudel2_backend:latest
- docker run -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:latest || echo "Unable to start image ... possibly the old wsgi process is still running?"
dependencies:
- build
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment