From c80c96af5e3130c991a31eb611a8ed9b4b8ca788 Mon Sep 17 00:00:00 2001
From: Caspar Jungbacker <74240267+CasparJungbacker@users.noreply.github.com>
Date: Sun, 13 Aug 2023 19:29:46 +0200
Subject: [PATCH 1/2] Update Dockerfile

---
 Dockerfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4a05cdd..65563bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,8 @@
-FROM httpd:latest
-
-COPY ./book/_build/html /usr/local/apache2/htdocs
\ No newline at end of file
+FROM continuumio/miniconda3
+WORKDIR /book
+COPY book/ .
+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

From 829096439df3eb467c0f20c3bf64e890b112f6d9 Mon Sep 17 00:00:00 2001
From: Caspar Jungbacker <c.a.a.jungbacker@student.tudelft.nl>
Date: Sun, 13 Aug 2023 19:39:12 +0200
Subject: [PATCH 2/2] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index faa92a0..e1f5194 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,26 +36,20 @@ test-build:
 
 build-book:
   stage: build
-  rules:
-    - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push"
-  script:
-    - jupyter-book clean book/
-    - jupyter-book build book/
-  artifacts:
-    expire_in: 30 days
-    paths:
-      - book/_build/html/
-
-build-container:
   image: docker
-  stage: build
   rules:
     - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push"
-  needs:
-    - build-book
   before_script:
     - docker info
   script:
-    - docker build -t $TAG_COMMIT -t $TAG_LATEST
-    - docker push $TAG_COMMIT
-    - docker push $TAG_LATEST
\ No newline at end of file
+    - docker build -t $TAG_LATEST
+    - docker push $TAG_LATEST
+
+deploy-book:
+  stage: deploy
+  image: docker
+  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