From f0cd4a6614cea72b6509e1f3e10398a48096f301 Mon Sep 17 00:00:00 2001 From: Eduard Frankford <e.frankford@student.uibk.ac.at> Date: Fri, 13 May 2022 11:21:16 +0200 Subject: [PATCH] adapted docker compose file to pull correct image and added deploy command --- .gitlab-ci.yml | 2 +- src/main/docker/gitsearch.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd50a4dc3..948a2c751 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,5 +141,5 @@ deploy: - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config script: - echo "Hello world" - # - "rsync -a --progress ./server/ blockly@stair-lab.uibk.ac.at:/var/www/ros-blockly/server" + - ssh contDeploy@codeability-austria -p 1022 -f "(cd /home/michael/gitsearch/src/main/docker/; GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` COMMIT_ID=`git rev-parse HEAD` SPRING_PROFILES_ACTIVE=staging,swagger docker-compose -f gitsearch.yml up -d --no-deps --build gitsearch-app)" when: manual diff --git a/src/main/docker/gitsearch.yml b/src/main/docker/gitsearch.yml index 7335b9a96..4fd5e1d6e 100644 --- a/src/main/docker/gitsearch.yml +++ b/src/main/docker/gitsearch.yml @@ -2,7 +2,8 @@ version: '3.5' services: gitsearch-app: # image: docker.uibk.ac.at:443/csar9407/gitsearch:staging-3c2e4895e32dd72aa90f64d7ec7584d656f4d18b - image: gitsearch:latest + # image: gitsearch:latest + image: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform container_name: sharing_search environment: - _JAVA_OPTIONS=-Xmx512m -Xms256m -- GitLab