Update docker-compose.gitlab-ci.yml
This commit is contained in:
parent
cf3fbaf63c
commit
7de4685db8
@ -24,12 +24,12 @@
|
|||||||
- chmod 700 ~/.ssh
|
- chmod 700 ~/.ssh
|
||||||
# Add keys to known hosts for Docker Compose
|
# Add keys to known hosts for Docker Compose
|
||||||
- ssh-keyscan $SSH_URL >> ~/.ssh/known_hosts
|
- ssh-keyscan $SSH_URL >> ~/.ssh/known_hosts
|
||||||
- if [[ -n "$DOCKER_REGISTRY" ]]; then echo "$DOCKER_REGISTRY_PASS" | docker login $DOCKER_REGISTRY --username $DOCKER_REGISTRY_USER --password-stdin; fi
|
|
||||||
#Install docker Compose, from release directly
|
#Install docker Compose, from release directly
|
||||||
- wget https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-linux-x86_64 -O /usr/local/bin/docker-compose
|
- wget https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-linux-x86_64 -O /usr/local/bin/docker-compose
|
||||||
- chmod +x /usr/local/bin/docker-compose
|
- chmod +x /usr/local/bin/docker-compose
|
||||||
script:
|
script:
|
||||||
- if [[ -n "$SCP_SOURCE" && -n "$SCP_DESTINATION" ]]; then scp -rp $SCP_SOURCE $SSH_USER@$SSH_URL:$SCP_DESTINATION; fi
|
- if [[ -n "$SCP_SOURCE" && -n "$SCP_DESTINATION" ]]; then scp -rp $SCP_SOURCE $SSH_USER@$SSH_URL:$SCP_DESTINATION; fi
|
||||||
|
- if [[ -n "$DOCKER_REGISTRY" ]]; then echo "$DOCKER_REGISTRY_PASS" | docker login $DOCKER_REGISTRY --username $DOCKER_REGISTRY_USER --password-stdin; fi
|
||||||
- DOCKER_HOST=ssh://$SSH_USER@$SSH_URL:$SSH_PORT docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans
|
- DOCKER_HOST=ssh://$SSH_USER@$SSH_URL:$SSH_PORT docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans
|
||||||
|
|
||||||
.broken-ssh-connection-workaround:
|
.broken-ssh-connection-workaround:
|
||||||
@ -38,6 +38,7 @@
|
|||||||
# Tunnel Docker socket from remote Maschine to local Maschine. This should be more stable than the current SSH Implementation of Docker
|
# Tunnel Docker socket from remote Maschine to local Maschine. This should be more stable than the current SSH Implementation of Docker
|
||||||
- rm -f /tmp/docker.sock
|
- rm -f /tmp/docker.sock
|
||||||
- ssh -M -S docker-ctrl-socket -fnNT -L /tmp/docker.sock:/var/run/docker.sock "$SSH_USER@$SSH_URL" -p $SSH_PORT -o ControlPersist=no
|
- ssh -M -S docker-ctrl-socket -fnNT -L /tmp/docker.sock:/var/run/docker.sock "$SSH_USER@$SSH_URL" -p $SSH_PORT -o ControlPersist=no
|
||||||
|
- if [[ -n "$DOCKER_REGISTRY" ]]; then echo "$DOCKER_REGISTRY_PASS" | docker login $DOCKER_REGISTRY --username $DOCKER_REGISTRY_USER --password-stdin; fi
|
||||||
- DOCKER_HOST=unix:///tmp/docker.sock docker-compose pull
|
- DOCKER_HOST=unix:///tmp/docker.sock docker-compose pull
|
||||||
- DOCKER_HOST=unix:///tmp/docker.sock docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans
|
- DOCKER_HOST=unix:///tmp/docker.sock docker-compose $COMPOSE_EXTRA_ARGS up -d --remove-orphans
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user