Commit ba441643 authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'change-to-stage-server' into 'develop'

fixes ssh for new server

See merge request !88
parents c3e24344 f697c4d5
Pipeline #1054 passed with stages
in 2 minutes and 43 seconds
......@@ -50,9 +50,10 @@ layout:
before_script:
- apk add openssh-client bash --no-cache
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | ssh-add -
- ssh-keyscan extensions-stage.typo3.org >> /root/.ssh/known_hosts
- ssh-keyscan extensions.typo3.org >> /root/.ssh/known_hosts
- echo "$SSH_PRIVATE_KEY_STAGE" | ssh-add -
- echo "$SSH_PRIVATE_KEY_PRODUCTION" | ssh-add -
- ssh-keyscan -p 22191 extensions-stage.typo3.org >> /root/.ssh/known_hosts
- ssh-keyscan -p 22179 extensions.typo3.org >> /root/.ssh/known_hosts
script:
- VERSION=4.0.0-alpine ./.gitlab-ci/scripts/deployer.sh -f/src/.gitlab-ci/deployer/deploy.php deploy ${CI_BUILD_REF_NAME}
when: manual
......@@ -63,8 +64,6 @@ layout:
deploy-master:
<<: *deploy_template
variables:
SSH_PRIVATE_KEY: "$SSH_PRIVATE_KEY_PRODUCTION"
environment:
name: master
url: https://extensions.typo3.org/
......@@ -73,8 +72,6 @@ deploy-master:
deploy-develop:
<<: *deploy_template
variables:
SSH_PRIVATE_KEY: "$SSH_PRIVATE_KEY_STAGE"
environment:
name: develop
url: https://extensions-stage.typo3.org/
......@@ -97,4 +94,4 @@ dump-assets:
when:
only:
- assets
except:
except:
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment