diff --git a/.drone.remote.yml b/.drone.remote.yml index dc976a4..7eec33e 100644 --- a/.drone.remote.yml +++ b/.drone.remote.yml @@ -61,10 +61,10 @@ steps: - echo git-domain=$GIT_DOMAIN >> env-stack - echo remote-domain=$REMOTE_DOMAIN >> env-stack - echo ssh-host=$SSH_HOST >> env-stack - - echo ss-port=$SSH_PORT >> env-stack + - echo ssh-port=$SSH_PORT >> env-stack - echo ssh-root-user=$SSH_ROOT_USER >> env-stack - echo ssh-user=$SSH_USER >> env-stack - - echo local_docker_registry=$LOCAL_DOCKER_REGISTRY >> env-stack + - echo local-docker-registry=$LOCAL_DOCKER_REGISTRY >> env-stack - name: test-ssh when: @@ -269,6 +269,14 @@ steps: - export REMOTE_DOMAIN=$REMOTE_DOMAIN - docker network prune -f - cd /home/$SSH_USER/gitea-drone-stack + - docker pull $${LOCAL_DOCKER_REGISTRY}guacamole-postgresql + - docker pull $${LOCAL_DOCKER_REGISTRY}ngrok-gitea + - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx + - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-drone + - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-remote + + - docker network prune -f + - docker stack rm remote-drone - sleep 60 - docker stack deploy -c docker-compose-remote.yml remote-drone diff --git a/docker-compose-remote.yml b/docker-compose-remote.yml index cdefe10..62ee687 100644 --- a/docker-compose-remote.yml +++ b/docker-compose-remote.yml @@ -7,7 +7,7 @@ services: replicas: 1 restart_policy: condition: any - image: ${LOCAL_DOCKER_REGISTRY}/letsencrypt-remote + image: ${LOCAL_DOCKER_REGISTRY}letsencrypt-remote environment: - SERVER_NAME=${REMOTE_DOMAIN} - CERTBOT_EMAIL=${CERTBOT_EMAIL} @@ -25,7 +25,7 @@ services: replicas: 1 restart_policy: condition: any - image: ${LOCAL_DOCKER_REGISTRY}/letsencrypt-drone + image: ${LOCAL_DOCKER_REGISTRY}letsencrypt-drone environment: - CERTBOT_EMAIL=${CERTBOT_EMAIL} - SERVER_NAME=${DRONE_DOMAIN} @@ -43,7 +43,7 @@ services: replicas: 1 restart_policy: condition: any - image: ${LOCAL_DOCKER_REGISTRY}/ngrok-gitea + image: ${LOCAL_DOCKER_REGISTRY}ngrok-gitea ports: - "4040:4040" volumes: @@ -160,7 +160,7 @@ services: replicas: 1 restart_policy: condition: any - image: ${LOCAL_DOCKER_REGISTRY}/guacamole-postgresql:latest + image: ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql:latest environment: POSTGRES_PASSWORD: guacroot POSTGRES_DB: guacamole_db