diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9bff31..f873169 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,18 +37,23 @@ deploy dev: - chmod 700 .ssh - echo -e $SSHKEY | sed 's/^ //' > .ssh/id_ed25519 - chmod 600 .ssh/id_ed25519 - - rsync -avr public $SSHUSER@$SSHHOST:$SSHPATH/geeks-cookbook-dev + - rsync -avr --delete -e 'ssh -i .ssh/id_ed25519' public $SSHUSER@$SSHHOST:$SSHPATH/geeks-cookbook-dev # - export LC_ALL=C.UTF-8 # - export LANG=C.UTF-8 # - s3cmd --no-mime-magic --access_key=$ACCESS_KEY --secret_key=$SECRET_KEY --acl-public --delete-removed --delete-after --no-ssl --host=$S3HOST --host-bucket='$S3HOSTBUCKET' sync public s3://geeks-cookbook-dev deploy prod: - image: garland/docker-s3cmd + image: alpine stage: deploy environment: production - only: + except: - master script: + - apk add rsync openssh --no-cache - export LC_ALL=C.UTF-8 - export LANG=C.UTF-8 - - s3cmd --no-mime-magic --access_key=$ACCESS_KEY --secret_key=$SECRET_KEY --acl-public --delete-removed --delete-after --no-ssl --host=$S3HOST --host-bucket='$S3HOSTBUCKET' sync public s3://geeks-cookbook + - mkdir .ssh + - chmod 700 .ssh + - echo -e $SSHKEY | sed 's/^ //' > .ssh/id_ed25519 + - chmod 600 .ssh/id_ed25519 + - rsync -avr --delete -e 'ssh -i .ssh/id_ed25519' public $SSHUSER@$SSHHOST:$SSHPATH/geeks-cookbook