diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2a7ea1..4766098 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,25 +88,25 @@ publish:prod: deploy:dev: stage: deploy - image: alpine:latest - environment: - name: dev - url: http://web.sik.party:3000 + image: docker:stable only: - master + environment: + name: dev + url: dev.sik.party + variables: + DOCKER_HOST: $DEV_CI_DOCKER_HOST + DOCKER_TLS_VERIFY: 1 before_script: - - pwd - - apk add --update openssh - - ssh -V - - mkdir -p ~/.ssh - - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa - - chmod 600 ~/.ssh/id_rsa - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - mkdir -p ~/.docker + - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem + - echo "$DEV_TLSCERT" > ~/.docker/cert.pem + - echo "$DEV_TLSKEY" > ~/.docker/key.pem + - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" script: - - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/docker-compose.yml - - scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/deploy_dev.sh - - ssh $DEV_SSH_USER@$DEV_SSH_HOST "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY" - - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment-frontend/deploy_dev.sh \"$IMAGE_NAME:latest\"" + - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" + after_script: + - docker logout "$CI_REGISTRY" deploy:prod: stage: deploy diff --git a/stack-compose-dev.yml b/stack-compose-dev.yml new file mode 100644 index 0000000..418f4e7 --- /dev/null +++ b/stack-compose-dev.yml @@ -0,0 +1,13 @@ +version: '3.4' + +services: + frontend: + image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-frontend:latest + deploy: + replicas: 1 + restart_policy: + condition: on-failure + update_config: + order: start-first + ports: + - 3000:3000