From ce2e653265ac071c9971a7380578492964f76453 Mon Sep 17 00:00:00 2001 From: Aryom Belousov Date: Tue, 10 Nov 2020 13:43:05 +0300 Subject: [PATCH] Added webhook to GOCD and changed restart policy --- .gitlab-ci.yml | 4 +++- docker-compose.yaml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b6b037..4f528f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,8 @@ test: deploy: stage: deploy image: "docker:19.03.12" + before_script: + - apk add curl variables: DOCKER_TLS_CERTDIR: "/certs" IMAGE_NAME: "$DOCKER_IMAGE_TAG:$CI_JOB_ID.$CI_COMMIT_SHORT_SHA" @@ -16,6 +18,6 @@ deploy: - docker login $REGISTRY_NAME -u $DOCKER_USER -p $DOCKER_PASSWORD - docker push $IMAGE_NAME - docker push $DOCKER_IMAGE_TAG - # - "curl -X POST -H \"Authorization: Bearer $GOCD_ACCESS_TOKEN\" -d '{\"repository_url\": \"https://gitlab.com/flygrounder/go-mtg-vk.git\"}' http://165.22.85.27:8153/go/admin/materials/git/notify" + - curl -X POST -H "Authorization: Bearer $GOCD_ACCESS_TOKEN" -d '{"repository_url": "https://gitlab.com/flygrounder/go-mtg-vk"}' -H "Accept: application/vnd.go.cd.v2+json" -H "Content-Type: application/json" http://165.22.85.27:8153/go/api/admin/materials/git/notify only: - master diff --git a/docker-compose.yaml b/docker-compose.yaml index 566ad30..f2ad917 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,5 +10,7 @@ services: ports: - "8888:80" + restart: "always" redis: image: "redis:6.0.9" + restart: "always"