Merge branch 'master' of ssh://git.thisfro.ch:222/thisfro/pflaenz.li

Forgot to pull first
This commit is contained in:
Jannis Portmann 2021-12-27 14:32:55 +01:00
commit 4260034fbe
2 changed files with 8 additions and 1 deletions

View file

@ -28,4 +28,4 @@ RUN yarn install && \
RUN cp .env.staging .env RUN cp .env.staging .env
# Run Migration and dev-webserver # Run Migration and dev-webserver
CMD /root/.symfony/bin/symfony console doctrine:migrations:migrate && /root/.symfony/bin/symfony serve --port=9999 --no-tls CMD /root/.symfony/bin/symfony console doctrine:migrations:migrate --no-interaction && /root/.symfony/bin/symfony serve --port=9999 --no-tls

7
Jenkinsfile vendored
View file

@ -24,6 +24,13 @@ node {
} }
} }
stage('Push image') {
docker.withRegistry('https://hub.thisfro.ch') {
app.push("$BUILD_NUMBER")
app.push('latest')
}
}
stage('Deploy staging') { stage('Deploy staging') {
sh 'docker-compose --project-directory /opt/containers/pflaenz.li --file /opt/containers/pflaenz.li/docker-compose.yml up -d' sh 'docker-compose --project-directory /opt/containers/pflaenz.li --file /opt/containers/pflaenz.li/docker-compose.yml up -d'
} }