Browse Source

Merge remote-tracking branch 'origin/develop' into f/react-grundstruktur

f/react-grundstruktur
Levin Faber 7 years ago
parent
commit
f10e874188
No known key found for this signature in database
GPG Key ID: 85C4F1EFCF5B0A71
  1. 12
      .gitlab-ci.yml

12
.gitlab-ci.yml

@ -45,7 +45,10 @@ build_docker_host:
- ls -la Docker/config/restart-host.sh
- rsync --progress -av -e ssh Docker/config/restart-host.sh $DEPLOY_ENV_USER@$DEPLOY_ENV_TARGET:/home/$DEPLOY_ENV_USER/restart-host.sh
- ssh $DEPLOY_ENV_USER@$DEPLOY_ENV_TARGET "./restart-host.sh"
when: manual
only:
changes:
- Docker/Dockerfile_FE_Host.dockerfile
- Docker/config/*
build_docker_builder:
stage: build
@ -57,5 +60,10 @@ build_docker_builder:
script:
- docker build -f Docker/Dockerfile_FE_Builder.dockerfile -t registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-build .
- docker push registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-build
when: manual
only:
changes:
- Docker/Dockerfile_FE_Builder.dockerfile
- Docker/config/*
- Frontend/package.json
- Frontend/package-lock.json

Loading…
Cancel
Save