From 395f6c4ba936f018795dede27df069e097922231 Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 17:53:05 +0100 Subject: [PATCH 01/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4320ecc..52ab653 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ image: stages: - test - build + - deploy Run Tests: stage: test @@ -28,3 +29,17 @@ Build and Push tag: script: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"gitlab-ci-token\",\"password\":\"$CI_JOB_TOKEN\"}}}" > /kaniko/.docker/config.json - /kaniko/executor --cache=true --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME + +Deploy Tag: + stage: deploy + image: debian:latest + only: + - branches + script: + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - eval $(ssh-agent -s) + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - ssh-add <(echo "$SSH_PRIVATE_KEY_B64" | base64 --decode) + - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts + - ssh root@192.168.10.59 "echo hello > ./tmp" \ No newline at end of file -- GitLab From b3d6d1887bdc8151f87b8698219ed129a994e42c Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 18:08:19 +0100 Subject: [PATCH 02/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52ab653..e031ebe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,6 +40,6 @@ Deploy Tag: - eval $(ssh-agent -s) - mkdir -p ~/.ssh - chmod 700 ~/.ssh - - ssh-add <(echo "$SSH_PRIVATE_KEY_B64" | base64 --decode) + - echo "$SSH_PRIVATE_KEY_B64" | base64 -d > .ssh/id_ed25519 - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts - ssh root@192.168.10.59 "echo hello > ./tmp" \ No newline at end of file -- GitLab From d1ade731d7e54aa65c48718b4c55253922182d75 Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 18:10:49 +0100 Subject: [PATCH 03/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e031ebe..9c267db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,6 +40,6 @@ Deploy Tag: - eval $(ssh-agent -s) - mkdir -p ~/.ssh - chmod 700 ~/.ssh - - echo "$SSH_PRIVATE_KEY_B64" | base64 -d > .ssh/id_ed25519 + - echo "$SSH_PRIVATE_KEY_B64" | base64 -d > ~/.ssh/id_ed25519 - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts - - ssh root@192.168.10.59 "echo hello > ./tmp" \ No newline at end of file + - ssh root@192.168.10.59 "echo hello > /tmp/gitlabci" \ No newline at end of file -- GitLab From 2fc0ed9b689754010df1a5ed7b78fa11cba6659c Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 18:13:28 +0100 Subject: [PATCH 04/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c267db..7bf847b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,5 +41,6 @@ Deploy Tag: - mkdir -p ~/.ssh - chmod 700 ~/.ssh - echo "$SSH_PRIVATE_KEY_B64" | base64 -d > ~/.ssh/id_ed25519 + - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts - ssh root@192.168.10.59 "echo hello > /tmp/gitlabci" \ No newline at end of file -- GitLab From b6ad4e44d70d5649d7144883b982cb8089c9f474 Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 18:22:28 +0100 Subject: [PATCH 05/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bf847b..946864e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,11 +36,11 @@ Deploy Tag: only: - branches script: - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - - eval $(ssh-agent -s) - mkdir -p ~/.ssh - chmod 700 ~/.ssh + - echo "$SSH_PRIVATE_KEY_B64" - echo "$SSH_PRIVATE_KEY_B64" | base64 -d > ~/.ssh/id_ed25519 + - cat ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts - ssh root@192.168.10.59 "echo hello > /tmp/gitlabci" \ No newline at end of file -- GitLab From 512e46c777aa171ccc6b4d24c4ab056b89ddb4f4 Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 18:25:56 +0100 Subject: [PATCH 06/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 946864e..ed7d243 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,10 +36,11 @@ Deploy Tag: only: - branches script: + - apt update -y && apt install openssh-client -y - mkdir -p ~/.ssh - chmod 700 ~/.ssh - - echo "$SSH_PRIVATE_KEY_B64" - - echo "$SSH_PRIVATE_KEY_B64" | base64 -d > ~/.ssh/id_ed25519 + - echo $SSH_PRIVATE_KEY_B64 + - echo $SSH_PRIVATE_KEY_B64 | base64 -d > ~/.ssh/id_ed25519 - cat ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts -- GitLab From 257840b3d433e65c36260a38ce61fd6d2e5978bf Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 18:41:12 +0100 Subject: [PATCH 07/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed7d243..140bbca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,9 +39,8 @@ Deploy Tag: - apt update -y && apt install openssh-client -y - mkdir -p ~/.ssh - chmod 700 ~/.ssh - - echo $SSH_PRIVATE_KEY_B64 - echo $SSH_PRIVATE_KEY_B64 | base64 -d > ~/.ssh/id_ed25519 - - cat ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts - - ssh root@192.168.10.59 "echo hello > /tmp/gitlabci" \ No newline at end of file + - ssh root@192.168.10.59 "docker stop $(docker ps -a -q) && docker rm $(docker ps -a -q)" + - ssh root@192.168.10.59 "docker run $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" -- GitLab From f6bc668a533904a8e830d787a3022f96b0843485 Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 19:01:33 +0100 Subject: [PATCH 08/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 140bbca..9dfbd37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,5 +42,5 @@ Deploy Tag: - echo $SSH_PRIVATE_KEY_B64 | base64 -d > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts - - ssh root@192.168.10.59 "docker stop $(docker ps -a -q) && docker rm $(docker ps -a -q)" - - ssh root@192.168.10.59 "docker run $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" + - ssh root@192.168.10.59 "docker rm $(docker ps -a -q) && docker rmi $(docker images -q)" + - ssh root@192.168.10.59 "docker run -v /opt/marvin/.env:/opt/nodeapp/.env $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" -- GitLab From ae3036782efdf983e886778335861a3e3bccc227 Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 19:04:04 +0100 Subject: [PATCH 09/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9dfbd37..67a2f71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,5 +42,5 @@ Deploy Tag: - echo $SSH_PRIVATE_KEY_B64 | base64 -d > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts - - ssh root@192.168.10.59 "docker rm $(docker ps -a -q) && docker rmi $(docker images -q)" + - ssh root@192.168.10.59 "docker rmi --force $CI_REGISTRY_IMAGE" - ssh root@192.168.10.59 "docker run -v /opt/marvin/.env:/opt/nodeapp/.env $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" -- GitLab From cdd2c608ebfc5e2e9af9f67f2fb57c081b3c03fa Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 19:11:41 +0100 Subject: [PATCH 10/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67a2f71..668e15e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,5 +42,5 @@ Deploy Tag: - echo $SSH_PRIVATE_KEY_B64 | base64 -d > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts - - ssh root@192.168.10.59 "docker rmi --force $CI_REGISTRY_IMAGE" + - ssh root@192.168.10.59 "docker rm -f $CI_REGISTRY_IMAGE 2>/dev/null || true" - ssh root@192.168.10.59 "docker run -v /opt/marvin/.env:/opt/nodeapp/.env $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" -- GitLab From d37640886de29b8d8dc972cd5fc34bfe6b7f453d Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 19:17:24 +0100 Subject: [PATCH 11/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 668e15e..a3613f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,5 +42,6 @@ Deploy Tag: - echo $SSH_PRIVATE_KEY_B64 | base64 -d > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan -H 192.168.10.59 >> ~/.ssh/known_hosts - - ssh root@192.168.10.59 "docker rm -f $CI_REGISTRY_IMAGE 2>/dev/null || true" - - ssh root@192.168.10.59 "docker run -v /opt/marvin/.env:/opt/nodeapp/.env $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" + - ssh root@192.168.10.59 "docker stop marvin || true" + - ssh root@192.168.10.59 "docker docker rmi --force $CI_REGISTRY_IMAGE 2>/dev/null || true" + - ssh root@192.168.10.59 "docker run --name marvin -v /opt/marvin/.env:/opt/nodeapp/.env $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" -- GitLab From b3b845ef30f78474cfc57ebbc382f755aee5649b Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Sun, 20 Oct 2019 19:22:30 +0100 Subject: [PATCH 12/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3613f7..fe265d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ Deploy Tag: stage: deploy image: debian:latest only: - - branches + - tags script: - apt update -y && apt install openssh-client -y - mkdir -p ~/.ssh -- GitLab