From c92edad79435fb68533d8e190e656c11adb40feb Mon Sep 17 00:00:00 2001 From: Artyom Belousov Date: Mon, 3 Jan 2022 09:03:16 +0300 Subject: [PATCH] Move from GitLab --- .gitlab-ci.yml | 27 --------------------------- docker-compose.yaml | 10 ++++++++-- 2 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index feaafca..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,27 +0,0 @@ -test: - image: "golang:1.15.4-buster" - stage: test - script: - - go test ./... -deploy: - stage: deploy - image: "docker:19.03.12" - before_script: - - apk add curl - variables: - DOCKER_TLS_CERTDIR: "/certs" - IMAGE_NAME_VK: "$DOCKER_IMAGE_TAG_VK:$CI_JOB_ID.$CI_COMMIT_SHORT_SHA" - IMAGE_NAME_TG: "$DOCKER_IMAGE_TAG_TG:$CI_JOB_ID.$CI_COMMIT_SHORT_SHA" - services: - - docker:19.03.12-dind - script: - - docker build . -t $DOCKER_IMAGE_TAG_VK -t $IMAGE_NAME_VK --build-arg VERSION=vk - - docker build . -t $DOCKER_IMAGE_TAG_TG -t $IMAGE_NAME_TG --build-arg VERSION=telegram - - docker login $REGISTRY_NAME -u $DOCKER_USER -p $DOCKER_PASSWORD - - docker push $IMAGE_NAME_VK - - docker push $DOCKER_IMAGE_TAG_VK - - docker push $IMAGE_NAME_TG - - docker push $DOCKER_IMAGE_TAG_TG - - "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\" https://gocd.flygrounder.ru/go/api/admin/materials/git/notify" - only: - - master diff --git a/docker-compose.yaml b/docker-compose.yaml index 67b6989..089a07e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,10 @@ version: "3.3" services: vk: - image: flygrounder/go-mtg-vk:latest + build: + context: . + args: + - VERSION=vk environment: - VK_TOKEN - VK_SECRET_KEY @@ -12,7 +15,10 @@ services: - "127.0.0.1:8888:8000" restart: "always" telegram: - image: flygrounder/go-mtg-telegram:latest + build: + context: . + args: + - VERSION=telegram environment: - TG_TOKEN restart: "always"