From 59382451dc627bc6ab5a42aa25b6909402d996a0 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Thu, 7 Jan 2021 21:57:53 +1300
Subject: [PATCH] Deb: build-deb now builds a .deb for Ubuntu 18

It builds the builder image first, then proceeeds to building .deb
inside it, and the result is put into the parent (../) directory.
---
 builder/build-deb                       |  9 +++++++--
 builder/build-deb-inside-docker         | 11 +++++++++++
 builder/dockerfile.ubuntu1804.deb.build |  4 +++-
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100755 builder/build-deb-inside-docker

diff --git a/builder/build-deb b/builder/build-deb
index f54d318..4ee7c40 100755
--- a/builder/build-deb
+++ b/builder/build-deb
@@ -2,5 +2,10 @@
 
 set -e
 
-dpkg-buildpackage -us -uc -b
-lintian ../*.deb
+cd "$(dirname "$0")/.."
+
+docker build -t debbuilder_ubuntu:18.04 -f \
+  builder/dockerfile.ubuntu1804.deb.build .
+
+deb_output_dir=$(cd .. && echo $PWD)
+docker run --rm -v "$deb_output_dir":/src debbuilder_ubuntu:18.04 /bin/bash -c '/src/*/builder/build-deb-inside-docker'
diff --git a/builder/build-deb-inside-docker b/builder/build-deb-inside-docker
new file mode 100755
index 0000000..7556e4f
--- /dev/null
+++ b/builder/build-deb-inside-docker
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+# Auto-install build-deps again
+# echo YYY | mk-build-deps --install debian/control
+
+dpkg-buildpackage -us -uc -b
+lintian ../*.deb
diff --git a/builder/dockerfile.ubuntu1804.deb.build b/builder/dockerfile.ubuntu1804.deb.build
index 76a5ea6..3125fec 100644
--- a/builder/dockerfile.ubuntu1804.deb.build
+++ b/builder/dockerfile.ubuntu1804.deb.build
@@ -3,6 +3,8 @@ FROM ubuntu:18.04
 RUN apt-get update && \
       apt-get -y install vim build-essential devscripts equivs
 
+# Install build-deps for the package.
 COPY ./debian/control /tmp
+RUN echo YYY | mk-build-deps --install --remove /tmp/control
 
-RUN echo YYY | mk-build-deps --install /tmp/control
+USER 1000