From 689596585ebf478c6948d1d6287de9bf394b075b Mon Sep 17 00:00:00 2001 From: Caspar Jungbacker Date: Mon, 26 Jun 2023 19:59:09 +0200 Subject: [PATCH 1/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e523a7..1d8bac2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,8 +69,8 @@ update-website: rules: - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push" script: - - docker-compose pull $CI_PROJECT_NAME - - docker-compose up -d + - docker-compose pull -f /etc/web_server/docker-compose.yml $CI_PROJECT_NAME + - docker-compose up -f /etc/web_server/docker-compose.yml -d environment: name: production url: https://interactivetextbooks.citg.tudelft.nl/ \ No newline at end of file From 3f27a19b98e8c1ae9dc117ae8e2e4386cf290d68 Mon Sep 17 00:00:00 2001 From: Caspar Jungbacker Date: Mon, 26 Jun 2023 20:21:04 +0200 Subject: [PATCH 2/6] Updated to newer version of docker compose --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d8bac2..14d0d93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,8 +69,8 @@ update-website: rules: - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push" script: - - docker-compose pull -f /etc/web_server/docker-compose.yml $CI_PROJECT_NAME - - docker-compose up -f /etc/web_server/docker-compose.yml -d + - docker compose pull -f /etc/web_server/docker-compose.yml $CI_PROJECT_NAME + - docker compose up -f /etc/web_server/docker-compose.yml -d environment: name: production url: https://interactivetextbooks.citg.tudelft.nl/ \ No newline at end of file From f77fea60bec651a490b48dbdc168d27f8ef9a2ec Mon Sep 17 00:00:00 2001 From: Caspar Jungbacker Date: Mon, 26 Jun 2023 20:29:56 +0200 Subject: [PATCH 3/6] Fix order of command options --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14d0d93..35e1594 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,8 +69,8 @@ update-website: rules: - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push" script: - - docker compose pull -f /etc/web_server/docker-compose.yml $CI_PROJECT_NAME - - docker compose up -f /etc/web_server/docker-compose.yml -d + - docker compose -f /etc/web_server/docker-compose.yml pull $CI_PROJECT_NAME + - docker compose -f /etc/web_server/docker-compose.yml up -d environment: name: production url: https://interactivetextbooks.citg.tudelft.nl/ \ No newline at end of file From 2225c34b9ad291e931f54f1a6726bee23435a90c Mon Sep 17 00:00:00 2001 From: Caspar Jungbacker Date: Tue, 27 Jun 2023 20:30:37 +0200 Subject: [PATCH 4/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35e1594..9e5bdc6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,8 +69,7 @@ update-website: rules: - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push" script: - - docker compose -f /etc/web_server/docker-compose.yml pull $CI_PROJECT_NAME - - docker compose -f /etc/web_server/docker-compose.yml up -d + - docker compose up -d environment: name: production url: https://interactivetextbooks.citg.tudelft.nl/ \ No newline at end of file From 376e74b106ba53befa7fbdd7095308f1197e9698 Mon Sep 17 00:00:00 2001 From: Caspar Jungbacker Date: Tue, 27 Jun 2023 20:31:27 +0200 Subject: [PATCH 5/6] Remove space --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e5bdc6..fa632f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ update-website: rules: - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push" script: - - docker compose up -d + - docker compose up -d environment: name: production url: https://interactivetextbooks.citg.tudelft.nl/ \ No newline at end of file From 0d592c0fdf339ba2fc9a28192ed03fa4464ae337 Mon Sep 17 00:00:00 2001 From: Caspar Jungbacker Date: Sun, 9 Jul 2023 13:06:41 +0200 Subject: [PATCH 6/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa632f7..3a2d9bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,6 @@ image: continuumio/miniconda:latest stages: - test - build - - deploy variables: PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" @@ -62,14 +61,6 @@ build-container: - docker build -t $TAG_COMMIT -t $TAG_LATEST . - docker push $TAG_COMMIT - docker push $TAG_LATEST - -update-website: - image: docker - stage: deploy - rules: - - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push" - script: - - docker compose up -d environment: name: production url: https://interactivetextbooks.citg.tudelft.nl/ \ No newline at end of file