From 0ab93ce0c4af891ad05547227fcf9c5c78129db2 Mon Sep 17 00:00:00 2001
From: Caspar Jungbacker <c.a.a.jungbacker@student.tudelft.nl>
Date: Mon, 14 Aug 2023 19:12:22 +0200
Subject: [PATCH 1/6] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c16665a..61a660f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: continuumio/miniconda:latest
 stages:
   - test
   - build
+  - deploy
 
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"

From c85b75aa02879e053c0317bb957b0e2c4e6180bf Mon Sep 17 00:00:00 2001
From: Caspar Jungbacker <c.a.a.jungbacker@student.tudelft.nl>
Date: Mon, 14 Aug 2023 19:15:37 +0200
Subject: [PATCH 2/6] Add dot

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61a660f..163c93e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ build-book:
   before_script:
     - docker info
   script:
-    - docker build -t $TAG_LATEST
+    - docker build -t $TAG_LATEST .
     - docker push $TAG_LATEST
 
 deploy-book:

From 336c4b076cd61a8e64bd2d062f9b60fdccc96c71 Mon Sep 17 00:00:00 2001
From: Caspar Jungbacker <c.a.a.jungbacker@student.tudelft.nl>
Date: Mon, 14 Aug 2023 19:54:11 +0200
Subject: [PATCH 3/6] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 163c93e..9dc9c8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,5 +48,6 @@ deploy-book:
   rules:
     - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push"
   script:
-    - docker compose -f /etc/web_server/docker-compose.yml pull
-    - docker compose -f /etc/web_server/docker-compose.yml up -d --no-deps manual
\ No newline at end of file
+    - docker stop $CI_PROJECT_NAME
+    - docker rm $CI_PROJECT_NAME
+    - docker run -d -p 8000:8000 --name $CI_PROJECT_NAME $TAG_LATEST
\ No newline at end of file

From 36d3f5996c404e958732b1d222b470768351dc45 Mon Sep 17 00:00:00 2001
From: Caspar Jungbacker <c.a.a.jungbacker@student.tudelft.nl>
Date: Mon, 14 Aug 2023 20:05:54 +0200
Subject: [PATCH 4/6] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dc9c8f..0f5555c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,4 +50,7 @@ deploy-book:
   script:
     - docker stop $CI_PROJECT_NAME
     - docker rm $CI_PROJECT_NAME
-    - docker run -d -p 8000:8000 --name $CI_PROJECT_NAME $TAG_LATEST
\ No newline at end of file
+    - docker run -d -p 8000:8000 --name $CI_PROJECT_NAME $TAG_LATEST
+  environment:
+    name: production
+    url: https://interactivetextbooks.citg.tudelft.nl/$CI_PROJECT_NAME
\ No newline at end of file

From 2c48673dcfa5fed686aaa15f353fe66bac8f9296 Mon Sep 17 00:00:00 2001
From: Caspar Jungbacker <c.a.a.jungbacker@student.tudelft.nl>
Date: Mon, 14 Aug 2023 20:08:05 +0200
Subject: [PATCH 5/6] Update entrypoint

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 65563bf..3e837c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,4 +5,4 @@ RUN apt-get update && apt-get -y install git gcc
 COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 RUN jupyter book build .
-ENTRYPOINT [ "python", "-m", "http.server", "8000", "--directory", "_build/html" ]
\ No newline at end of file
+ENTRYPOINT [ "python", "-m", "http.server", "8000", "--directory", "/book/_build/html" ]
\ No newline at end of file

From 5c1bba1bd565f9b1978ec0bb9fb33bc9c50aee3f Mon Sep 17 00:00:00 2001
From: Caspar Jungbacker <c.a.a.jungbacker@student.tudelft.nl>
Date: Fri, 22 Sep 2023 11:24:33 +0200
Subject: [PATCH 6/6] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f5555c..c27ed4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,16 +41,19 @@ build-book:
   script:
     - docker build -t $TAG_LATEST .
     - docker push $TAG_LATEST
+    - docker image prune -f
 
 deploy-book:
   stage: deploy
   image: docker
   rules:
     - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push"
+  before_script:
+    - docker info
+    - docker stop $CI_PROJECT_NAME || exit_code=$?
+    - if [ $exit_code -ne 0 ]; then echo "Container $CI_PROJECT_NAME not found, cannot stop"; else docker rm $CI_PROJECT_NAME; fi
   script:
-    - docker stop $CI_PROJECT_NAME
-    - docker rm $CI_PROJECT_NAME
-    - docker run -d -p 8000:8000 --name $CI_PROJECT_NAME $TAG_LATEST
+    - docker run -d --restart always -p 8000:8000 --name $CI_PROJECT_NAME $TAG_LATEST
   environment:
     name: production
     url: https://interactivetextbooks.citg.tudelft.nl/$CI_PROJECT_NAME
\ No newline at end of file