From c6bcc8722c862eb2cdc52b27fe47e965630da421 Mon Sep 17 00:00:00 2001
From: Andrei Jiroh Halili <ajhalili2006@gmail.com>
Date: Sat, 15 Jul 2023 17:51:39 +0000
Subject: [PATCH] Fix some Docker-related issues

Signed-off-by: Andrei Jiroh Halili <ajhalili2006@gmail.com>
---
 .gitlab-ci.yml    |  2 --
 docker/Dockerfile | 12 ++++++++----
 docker/README.md  | 11 +++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 docker/README.md

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea29f6f..8f87754 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,6 @@ default:
     - pip3 install -r requirements.txt
     - npm ci
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
-    - (curl -Ls --tlsv1.2 --proto "=https" --retry 3 https://cli.doppler.com/install.sh || wget -t 3 -qO- https://cli.doppler.com/install.sh) | sh
 # Global builds and stuff
 variables:
   DEBUG: "1"
@@ -26,7 +25,6 @@ variables:
 pages:
   stage: build
   script:
-    - bash ./build.sh
     - doppler run -- ./bin/deploykit-pages.sh
   artifacts:
     paths:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a87e628..b3232d4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -36,7 +36,10 @@ RUN apk add --no-cache \
      git \
      git-fast-import \
      openssh \
-  && pip3 install --no-cache-dir \
+     gnupg \
+  && (curl -Ls --tlsv1.2 --proto "=https" --retry 3 https://cli.doppler.com/install.sh || wget -t 3 -qO- https://cli.doppler.com/install.sh) \
+    | sh
+RUN pip3 install --no-cache-dir \
       mkdocs-material \ 
       mkdocs-redirects \
       mkdocs-git-revision-date-localized-plugin \
@@ -51,6 +54,7 @@ RUN git config --global --add safe.directory /docs &&\
 # Expose MkDocs development server port
 EXPOSE 8000
 
-COPY entrypoint.sh /usr/local/bin/entrypoint
-ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
-CMD [ "serve", "--dev-addr=0.0.0.0:8000" ]
\ No newline at end of file
+WORKDIR /docs
+
+#COPY entrypoint.sh /usr/local/bin/entrypoint
+CMD [ "mkdocs", "serve", "--dev-addr=0.0.0.0:8000" ]
\ No newline at end of file
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000..ef9ff11
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,11 @@
+# CI image for GitLab CI deploys
+
+This directory contains the necessary files to build a container image for the website deployments.
+
+## How to build
+
+Just run the script to build locally
+
+```bash
+./docker/build.sh
+```