From 931b6776da886113b3ec7d948d878bd8ee50ac6e Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Sat, 26 Oct 2019 06:06:59 +0200
Subject: Second test

---
 builder/Dockerfile          | 15 +++++++++------
 builder/files/entrypoint.sh | 11 +++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 builder/files/entrypoint.sh

(limited to 'builder')

diff --git a/builder/Dockerfile b/builder/Dockerfile
index 898cfd3..7e257b7 100644
--- a/builder/Dockerfile
+++ b/builder/Dockerfile
@@ -1,9 +1,12 @@
 FROM chsa/gbootstrap
 
-RUN \
-    cd /darklin/gentoo && git pull && \
-    cd /darklin/darklin4 && git pull && \
-    emerge --sync && eix-sync &&  \
-    emerge -1 portage
+# We do it now inside (git pull also may bring back un-necessary and potentialy problematic configs)
+#RUN \
+#    cd /darklin/gentoo && git pull && \
+#    cd /darklin/darklin4 && git pull && \
+#    emerge --sync && eix-sync &&  \
+#    emerge -1 portage
+
+COPY files/ /
  
-CMD ["/bin/bash", "/etc/portage/scripts/bootstrap/builder.sh"]
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/builder/files/entrypoint.sh b/builder/files/entrypoint.sh
new file mode 100644
index 0000000..6685207
--- /dev/null
+++ b/builder/files/entrypoint.sh
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ ! -d "/darklin/gentoo" ]; then
+    cd "/darklin" && git clone http://darksoft.org/git/csa/devops/darkconf/gentoo.git || exit 1
+fi
+
+if [ ! -d "/darklin/darklin4" ]; then
+    cd "/darklin" && git clone http://darksoft.org/git/csa/devops/darkconf/darklin4.git || exit 1
+fi
+
+/bin/bash "/etc/portage/scripts/bootstrap/builder.sh"
-- 
cgit v1.2.3