From d7dc258360ee3578b596090b2de8472ede601f6d Mon Sep 17 00:00:00 2001 From: Aaron Date: Mon, 7 Mar 2022 02:08:26 +0100 Subject: [PATCH 1/4] update pipeline --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b16fac..9227d13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,7 +56,7 @@ before_script: deploy_staging: stage: deploy script: - - ssh $SSH_SERVER "cd /root && docker-compose up -d bot && exit" + - ssh $SSH_SERVER "cd /root && docker-compose up -d shbot && exit" only: - master \ No newline at end of file From 5bb96b6ece9af3565c2a13b257f804fbc86694d0 Mon Sep 17 00:00:00 2001 From: Aaron Date: Mon, 7 Mar 2022 02:28:26 +0100 Subject: [PATCH 2/4] update pipeline --- .gitlab-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9227d13..f5f9b39 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,15 +44,11 @@ docker-build: - dev before_script: - - apt-get update -qq - - apt-get install -qq git - # Setup SSH deploy keys - - 'which ssh-agent || ( apt-get install -qq openssh-client )' - eval $(ssh-agent -s) - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - + deploy_staging: stage: deploy script: From 3e76d80f7439c17ef350e569ff2192e509eaba10 Mon Sep 17 00:00:00 2001 From: Aaron Date: Mon, 7 Mar 2022 02:31:31 +0100 Subject: [PATCH 3/4] update pipeline --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5f9b39..aa6cf4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,6 +44,9 @@ docker-build: - dev before_script: + - apt-get update -qq + # Setup SSH deploy keys + - 'which ssh-agent || ( apt-get install -qq openssh-client )' - eval $(ssh-agent -s) - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh From 3f900f106322a72a1580e667b23f4ece79889169 Mon Sep 17 00:00:00 2001 From: Aaron Date: Mon, 7 Mar 2022 02:35:57 +0100 Subject: [PATCH 4/4] update pipeline --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa6cf4d..19eb4b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ before_script: deploy_staging: stage: deploy script: - - ssh $SSH_SERVER "cd /root && docker-compose up -d shbot && exit" + - ssh $SSH_SERVER "cd /root && docker-compose pull shbot && docker-compose up -d shbot && exit" only: - master \ No newline at end of file