From 4627cd898b9e2b1dc2d53dabbcba5457cc80ff55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=81=A3?= <⁣>
Date: Sat, 20 Jun 2020 16:43:32 +0200
Subject: [PATCH] Clean Dockerfile & Clone repositories with HTTPS

---
 dom/Dockerfile         | 9 +++++----
 dom/entrypoint.sh      | 2 +-
 go/tests/entrypoint.sh | 2 +-
 js/tests/Dockerfile    | 2 ++
 js/tests/entrypoint.sh | 2 +-
 sh/tests/entrypoint.sh | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dom/Dockerfile b/dom/Dockerfile
index 02fca84c0..684a34192 100644
--- a/dom/Dockerfile
+++ b/dom/Dockerfile
@@ -1,10 +1,11 @@
-FROM buildkite/puppeteer:latest
+FROM buildkite/puppeteer
 
 ENV GIT_TERMINAL_PROMPT=0
 RUN apt-get update
 RUN apt-get install -y git
+COPY --from=mkcert-ca . /usr/local/share/ca-certificates
+RUN update-ca-certificates
 WORKDIR /app
-COPY ./dom .
-COPY ./subjects ./subjects
-RUN ls -la
+COPY dom .
+COPY subjects ./subjects
 ENTRYPOINT ["/bin/sh", "/app/entrypoint.sh"]
diff --git a/dom/entrypoint.sh b/dom/entrypoint.sh
index 1de5a8801..0257e15f2 100644
--- a/dom/entrypoint.sh
+++ b/dom/entrypoint.sh
@@ -11,7 +11,7 @@ cd student
 
 if test "$REPOSITORY"; then
   password=$(cat)
-  git clone --quiet --depth=1 --shallow-submodules http://root:"${password}"@"$REPOSITORY" .
+  git clone --quiet --depth=1 --shallow-submodules https://root:"${password}"@"$REPOSITORY" .
 else
   first_file=$(echo "$EXPECTED_FILES" | cut -d' ' -f1)
   mkdir -p "$(dirname "$first_file")"
diff --git a/go/tests/entrypoint.sh b/go/tests/entrypoint.sh
index 784dee1e4..3a1ed7574 100755
--- a/go/tests/entrypoint.sh
+++ b/go/tests/entrypoint.sh
@@ -11,7 +11,7 @@ cd src/student
 
 if test "$REPOSITORY"; then
 	password=$(cat)
-	git clone --quiet --depth=1 --shallow-submodules http://root:"${password}"@"$REPOSITORY" .
+	git clone --quiet --depth=1 --shallow-submodules https://root:"${password}"@"$REPOSITORY" .
 else
 	first_file=$(echo "$EXPECTED_FILES" | cut -d' ' -f1)
 	mkdir -p "$(dirname "$first_file")"
diff --git a/js/tests/Dockerfile b/js/tests/Dockerfile
index 9da158ac8..7b8dbdb26 100644
--- a/js/tests/Dockerfile
+++ b/js/tests/Dockerfile
@@ -2,6 +2,8 @@ FROM node:14-alpine
 
 ENV GIT_TERMINAL_PROMPT=0
 RUN apk add --no-cache git
+COPY --from=mkcert-ca . /usr/local/share/ca-certificates
+RUN update-ca-certificates
 WORKDIR /app
 COPY . .
 ENTRYPOINT ["/bin/sh", "/app/entrypoint.sh"]
diff --git a/js/tests/entrypoint.sh b/js/tests/entrypoint.sh
index 1b94ccf61..f3c85d9f8 100644
--- a/js/tests/entrypoint.sh
+++ b/js/tests/entrypoint.sh
@@ -11,7 +11,7 @@ cd student
 
 if test "$REPOSITORY"; then
   password=$(cat)
-  git clone --quiet --depth=1 --shallow-submodules http://root:"${password}"@"$REPOSITORY" .
+  git clone --quiet --depth=1 --shallow-submodules https://root:"${password}"@"$REPOSITORY" .
 else
   first_file=$(echo "$EXPECTED_FILES" | cut -d' ' -f1)
   mkdir -p "$(dirname "$first_file")"
diff --git a/sh/tests/entrypoint.sh b/sh/tests/entrypoint.sh
index 62aa43c37..cf072abd4 100755
--- a/sh/tests/entrypoint.sh
+++ b/sh/tests/entrypoint.sh
@@ -10,7 +10,7 @@ cd student
 
 if test "$REPOSITORY"; then
 	password=$(cat)
-	git clone --quiet --depth=1 --shallow-submodules http://root:"${password}"@"$REPOSITORY" .
+	git clone --quiet --depth=1 --shallow-submodules https://root:"${password}"@"$REPOSITORY" .
 else
 	first_file=$(echo "$EXPECTED_FILES" | cut -d' ' -f1)
 	mkdir -p "$(dirname "$first_file")"