diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b64944b..f0a8c51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -205,8 +205,7 @@ staging:deploy: before_script: &staging_tunnel - "apk --update add openssh-client" - "eval $(ssh-agent -s)" - - ssh -V - # - "echo \"$STAGING_SSH_PRIV_KEY\" | tr -d '\r' | ssh-add - > /dev/null" + - "echo ${#STAGING_SSH_PRIV_KEY}" - "echo \"$STAGING_SSH_PRIV_KEY\" | tr -d '\r' | ssh-add - " # - "ssh -Mo StrictHostKeyChecking=no -S deploy-ctrl-socket -fnNTL /var/run/docker.sock:/var/run/docker.sock ${DEPLOY_TARGET}" # - "ssh -S deploy-ctrl-socket -O check ${DEPLOY_TARGET}" @@ -218,6 +217,38 @@ staging:deploy: - docker stack deploy --with-registry-auth -c docker-compose.staging.yml webui when: manual allow_failure: false + +# deploy:development: +# image: docker:20.10.21 +# stage: deploy +# variables: +# DOCKER_DRIVER: overlay2 +# DEPLOY_IMAGE: ${CI_REGISTRY}/brandx/bxt-app/production:development +# DOCKER_HOST: ssh://deploy@bxt-dev.adaptiveagriculture.ca +# DEPLOY_TARGET: deploy@bxt-dev.adaptiveagriculture.ca +# only: +# - dev_environment +# environment: +# name: Development +# url: https://bxt-dev.adaptiveagriculture.ca +# before_script: &dev_tunnel +# - "apk --update add openssh-client" +# - "eval $(ssh-agent -s)" +# - ssh -V +# - cat /etc/os-release +# - "echo DEPLOY_TARGET=${DEPLOY_TARGET}" +# - "echo DOCKER_HOST=${DOCKER_HOST}" +# - "echo \"$DEVELOPMENT_SSH_PRIV_KEY\" | tr -d '\r' | ssh-add - " +# # - "ssh -Mo StrictHostKeyChecking=no -S deploy-ctrl-socket -fnNTL /var/run/docker.sock:/var/run/docker.sock ${DEPLOY_TARGET}" +# # - "ssh -S deploy-ctrl-socket -O check ${DEPLOY_TARGET}" +# - mkdir -p ~/.ssh +# - chmod 700 ~/.ssh +# - ssh -o StrictHostKeyChecking=no ${DEPLOY_TARGET} +# script: +# - docker login -u ${CI_REGISTRY_USER} -p ${CI_JOB_TOKEN} ${CI_REGISTRY} +# - docker stack deploy --with-registry-auth -c docker-compose.dev.yml webui +# when: manual +# allow_failure: false dependencies:development: image: node:$NODE_VERSION