diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4364c45..4766098 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,28 +86,6 @@ publish:prod: - docker build . -f Dockerfile.prod -t "$IMAGE_NAME":prod - docker push "$IMAGE_NAME":prod -# deploy:dev: -# stage: deploy -# image: alpine:latest -# environment: -# name: dev -# url: http://web.sik.party:3000 -# only: -# - master -# 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' -# 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\"" - deploy:dev: stage: deploy image: docker:stable @@ -116,7 +94,6 @@ deploy:dev: environment: name: dev url: dev.sik.party - when: manual variables: DOCKER_HOST: $DEV_CI_DOCKER_HOST DOCKER_TLS_VERIFY: 1 @@ -127,7 +104,7 @@ deploy:dev: - echo "$DEV_TLSKEY" > ~/.docker/key.pem - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" script: - - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME" + - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" after_script: - docker logout "$CI_REGISTRY" 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