From 2b4ee3abeabdf1bd55fec23d61df104c1e4a46f0 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Mon, 27 Apr 2020 14:11:44 +0200
Subject: [PATCH] Update docker config for Debian-10 / LibreSOC.

---
 bootstrap/docker/debian-10/Dockerfile.debug    |  4 ++++
 bootstrap/docker/debian-10/Dockerfile.libresoc | 12 ++++++++++++
 bootstrap/docker/debian-10/root/soclayout      |  1 +
 bootstrap/dockerManager.sh                     |  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 bootstrap/docker/debian-10/Dockerfile.debug
 create mode 100644 bootstrap/docker/debian-10/Dockerfile.libresoc
 create mode 160000 bootstrap/docker/debian-10/root/soclayout

diff --git a/bootstrap/docker/debian-10/Dockerfile.debug b/bootstrap/docker/debian-10/Dockerfile.debug
new file mode 100644
index 00000000..34cfe612
--- /dev/null
+++ b/bootstrap/docker/debian-10/Dockerfile.debug
@@ -0,0 +1,4 @@
+
+FROM debian10.libresoc
+
+CMD [ "/bin/bash", "-i" ]
diff --git a/bootstrap/docker/debian-10/Dockerfile.libresoc b/bootstrap/docker/debian-10/Dockerfile.libresoc
new file mode 100644
index 00000000..ddb2953f
--- /dev/null
+++ b/bootstrap/docker/debian-10/Dockerfile.libresoc
@@ -0,0 +1,12 @@
+
+FROM debian10.coriolis
+
+# Cannot clone directly from LibreSOC repository as I need my
+# ssh key that I cannot forward to the docker build process.
+#
+# git clone ssh://gitolite3@libre-riscv.org:922/soclayout.git 
+
+COPY ./root/soclayout /root/coriolis-2.x/src/soclayout
+RUN  cd /root/coriolis-2.x/src/soclayout \
+ &&  git checkout 75e03eb
+
diff --git a/bootstrap/docker/debian-10/root/soclayout b/bootstrap/docker/debian-10/root/soclayout
new file mode 160000
index 00000000..bd6b7800
--- /dev/null
+++ b/bootstrap/docker/debian-10/root/soclayout
@@ -0,0 +1 @@
+Subproject commit bd6b78003c0cc6579fbad73593e69f2714f3a770
diff --git a/bootstrap/dockerManager.sh b/bootstrap/dockerManager.sh
index 99f4e11a..7223f600 100755
--- a/bootstrap/dockerManager.sh
+++ b/bootstrap/dockerManager.sh
@@ -121,7 +121,7 @@
      docker build -f Dockerfile.coriolis -t ${coriolisImage} .
    fi
 
-   if [ ${doBuildCoriolis} -ne 0 ]; then
+   if [ ${doBuildBash} -ne 0 ]; then
      echo "Build \"${bashImage}\" docker image."
      docker build -f Dockerfile.bash -t ${bashImage}     .
    fi