From 0eeaeb077d8ee97c1267bb4fe125c9ced7c25e2a Mon Sep 17 00:00:00 2001 From: Levin Faber Date: Thu, 9 May 2019 17:34:15 +0000 Subject: [PATCH] Update .gitlab-ci.yml, Docker/config/restart-host.sh files --- .gitlab-ci.yml | 15 +++++++++++++++ Docker/config/restart-host.sh | 7 +++++++ 2 files changed, 22 insertions(+) create mode 100644 Docker/config/restart-host.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16d67ee..abba566 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,4 +35,19 @@ build_docker_host: script: - docker build -f Docker/Dockerfile_FE_Host -t registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-serve . - docker push registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-serve + when: + - manual + + build_docker_builder: + stage: build + tags: + - docker-builder + before_script: + - docker info + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + script: + - docker build -f Docker/Dockerfile_FE_Builder -t registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-build . + - docker push registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-build + when: + - manual diff --git a/Docker/config/restart-host.sh b/Docker/config/restart-host.sh new file mode 100644 index 0000000..8bbabfe --- /dev/null +++ b/Docker/config/restart-host.sh @@ -0,0 +1,7 @@ +#! /bin/bash +docker login -u gitlab+deploy-token-66068 -p vD23SzzitUn8y8xGknKz registry.gitlab.com +docker stop eva_frontend_serve +docker rm eva_frontend_serve +docker rmi registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-serve +docker run -d -p 8083:80 -v /home/gitlab/serve:/usr/share/nginx/html:ro --name "eva_frontend_serve" registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-serve +