From 9f285a9ed8c2c99063355665cb9e401191cb9b1e Mon Sep 17 00:00:00 2001 From: Wolfgang Rathgeb Date: Tue, 31 Mar 2020 15:37:36 +0200 Subject: [PATCH 1/3] gitflow-feature-stash: auto_deploy_live --- deploy/deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 609e5dc..20c399e 100644 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -61,6 +61,8 @@ case "$TRAVIS_BRANCH" in master) inform_live + echo "master" + deploy "test" "editor" $DOCKERTAG "${SYSTEM}-schul-cloud_editor" ;; develop) From 3b37033e27b17a4e41bc248eded3e7c312a02586 Mon Sep 17 00:00:00 2001 From: Wolfgang Rathgeb Date: Tue, 31 Mar 2020 15:39:53 +0200 Subject: [PATCH 2/3] change name --- deploy/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 20c399e..32be36e 100644 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -62,7 +62,7 @@ case "$TRAVIS_BRANCH" in master) inform_live echo "master" - deploy "test" "editor" $DOCKERTAG "${SYSTEM}-schul-cloud_editor" + deploy "test" "editor" $DOCKERTAG "${SYSTEM}_editor" ;; develop) From 9baf7b0307b4fa1dc8fc5c9ef4bdea010b72031b Mon Sep 17 00:00:00 2001 From: Wolfgang Rathgeb Date: Wed, 1 Apr 2020 10:12:40 +0200 Subject: [PATCH 3/3] change system --- deploy/deploy.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 32be36e..e6d0134 100644 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -26,7 +26,7 @@ inform_staging() { } deploy(){ - SYSTEM=$1 # [staging, test, demo] + SYSTEM=$1 # [staging.schul-cloud.org, test.schul-cloud.org, demo.schul-cloud.org, ....] DOCKER_IMAGE=$2 # (editor), autoprefixed with "schulcloud-" DOCKER_TAG=$3 # version/tag of the image to use. Usually the branch name or a GIT_SHA @@ -35,7 +35,7 @@ deploy(){ echo "deploy " $DOCKER_IMAGE ":" $DOCKER_TAG " to " $SYSTEM " as " $DOCKER_SERVICE_NAME # deploy new dockerfile - ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i travis_rsa linux@$SYSTEM.schul-cloud.org /usr/bin/docker service update --force --image schulcloud/schulcloud-$DOCKER_IMAGE:$DOCKER_TAG $DOCKER_SERVICE_NAME + ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i travis_rsa linux@$SYSTEM /usr/bin/docker service update --force --image schulcloud/schulcloud-$DOCKER_IMAGE:$DOCKER_TAG $DOCKER_SERVICE_NAME } # ---------------- @@ -62,17 +62,18 @@ case "$TRAVIS_BRANCH" in master) inform_live echo "master" - deploy "test" "editor" $DOCKERTAG "${SYSTEM}_editor" + deploy "schul-cloud.org" "editor" $DOCKERTAG "SC_editor" + deploy "niedersachsen.cloud" "editor" $DOCKERTAG "NBC_editor" ;; develop) echo "develop" # deploy $SYSTEM $DOCKERFILE $DOCKERTAG $DOCKER_SERVICENAME $COMPOSE_DUMMY $COMPOSE_FILE $COMPOSE_SERVICENAME - deploy "test" "editor" $DOCKERTAG "test-schul-cloud_editor" + deploy "test.schul-cloud.org" "editor" $DOCKERTAG "test-schul-cloud_editor" ;; release* | hotfix*) echo "release/hotfix" - deploy "staging" "editor" $DOCKERTAG "staging_editor" + deploy "staging.schul-cloud.org" "editor" $DOCKERTAG "staging_editor" ;; esac