docker(debian-dev): try to fix sbuild.

9 files changed, 29 insertions, 9 deletions

diff --git a/docker/debian-dev/Dockerfile b/docker/debian-dev/Dockerfile
index e43764e..950e1af 100644
--- a/docker/debian-dev/Dockerfile
+++ b/docker/debian-dev/Dockerfile
@@ -1,17 +1,13 @@
 FROM debian:11
 
 ARG IN_CHINA=
+ARG BUILD_FOR_ARCH=amd64
 ENV IN_CHINA=${IN_CHINA}
+ARG BUILD_FOR_ARCH=${BUILD_FOR_ARCH}
 
 ADD bootstrap /bootstrap
 
-RUN /bootstrap/apt-source/setup.bash
-RUN /bootstrap/setup-base.bash
-RUN /bootstrap/setup-dev-tools.bash
-RUN /bootstrap/setup-dev-tools-arm64.bash
-RUN /bootstrap/setup-sbuild-base.bash
-RUN /bootstrap/setup-sbuild-amd64.bash
-RUN /bootstrap/setup-sbuild-arm64.bash
+RUN /bootstrap/setup.bash
 
 VOLUME [ "/source", "/data" ]
 CMD [ "bash", "-l" ]
diff --git a/docker/debian-dev/bootstrap/setup-sbuild-amd64.bash b/docker/debian-dev/bootstrap/sbuild/setup-sbuild-amd64.bash
index 9ee08d1..9ee08d1 100755
--- a/docker/debian-dev/bootstrap/setup-sbuild-amd64.bash
+++ b/docker/debian-dev/bootstrap/sbuild/setup-sbuild-amd64.bash
diff --git a/docker/debian-dev/bootstrap/setup-sbuild-arm64.bash b/docker/debian-dev/bootstrap/sbuild/setup-sbuild-arm64.bash
index 5feac2d..5feac2d 100755
--- a/docker/debian-dev/bootstrap/setup-sbuild-arm64.bash
+++ b/docker/debian-dev/bootstrap/sbuild/setup-sbuild-arm64.bash
diff --git a/docker/debian-dev/bootstrap/setup-sbuild-base.bash b/docker/debian-dev/bootstrap/sbuild/setup-sbuild-base.bash
index a200d3f..a200d3f 100755
--- a/docker/debian-dev/bootstrap/setup-sbuild-base.bash
+++ b/docker/debian-dev/bootstrap/sbuild/setup-sbuild-base.bash
diff --git a/docker/debian-dev/bootstrap/sbuild/setup-sbuild.bash b/docker/debian-dev/bootstrap/sbuild/setup-sbuild.bash
new file mode 100755
index 0000000..f260e5d
--- /dev/null
+++ b/docker/debian-dev/bootstrap/sbuild/setup-sbuild.bash
@@ -0,0 +1,11 @@
+#! /usr/bin/env bash
+
+/bootstrap/sbuild/setup-sbuild-base.bash
+
+if [[ "$BUILD_FOR_ARCH" == "amd64" ]]; then
+    /bootstrap/sbuild/setup-sbuild-amd64.bash
+fi
+
+if [[ "$BUILD_FOR_ARCH" == "arm64" ]]; then
+    /bootstrap/sbuild/setup-sbuild-arm64.bash
+fi
diff --git a/docker/debian-dev/bootstrap/setup-base.bash b/docker/debian-dev/bootstrap/setup-base.bash
index 5b63fbe..58adc1b 100755
--- a/docker/debian-dev/bootstrap/setup-base.bash
+++ b/docker/debian-dev/bootstrap/setup-base.bash
@@ -2,7 +2,7 @@
 
 set -e
 
+apt-get update
 apt-get install -y vim less man curl bash-completion rsync
 
 cat /bootstrap/bash-profile/bash-completion.bash >> /root/.bash_profile
-
diff --git a/docker/debian-dev/bootstrap/setup-dev-tools-arm64.bash b/docker/debian-dev/bootstrap/setup-dev-tools-arm64.bash
index 4c881aa..5fb7859 100755
--- a/docker/debian-dev/bootstrap/setup-dev-tools-arm64.bash
+++ b/docker/debian-dev/bootstrap/setup-dev-tools-arm64.bash
@@ -6,4 +6,3 @@ dpkg --add-architecture arm64
 apt-get update
 
 apt-get install -y crossbuild-essential-arm64
-
diff --git a/docker/debian-dev/bootstrap/setup-dev-tools.bash b/docker/debian-dev/bootstrap/setup-dev-tools.bash
index 92f59c8..f2426aa 100755
--- a/docker/debian-dev/bootstrap/setup-dev-tools.bash
+++ b/docker/debian-dev/bootstrap/setup-dev-tools.bash
@@ -12,3 +12,7 @@ for f in /bootstrap/home-dot/*; do
     filename=$(basename "$f")
     cp "$f" "/root/.$filename"
 done
+
+if [[ "$BUILD_FOR_ARCH" == "arm64" ]]; then
+    /bootstrap/setup-dev-tools-arm64.bash
+fi
diff --git a/docker/debian-dev/bootstrap/setup.bash b/docker/debian-dev/bootstrap/setup.bash
new file mode 100755
index 0000000..fac0393
--- /dev/null
+++ b/docker/debian-dev/bootstrap/setup.bash
@@ -0,0 +1,10 @@
+#! /usr/bin/env bash
+
+set -e
+
+/bootstrap/apt-source/setup.bash
+/bootstrap/setup-base.bash
+/bootstrap/setup-dev-tools.bash
+/bootstrap/sbuild/setup-sbuild.bash
+
+rm -rf /var/lib/apt/lists/*