From bbd6578f574d40e3acbdee376e076b89c7b5f9d1 Mon Sep 17 00:00:00 2001
From: crims0n <crims0n@yandex.ru>
Date: Mon, 18 Jan 2021 16:43:31 +0300
Subject: [PATCH] bugfixes

---
 docker/Dockerfile.minios-live                 | 16 ----------------
 docker/Dockerfile.minios-live-container       |  7 +++++++
 ...erfile.minios-live-container.0@install.sh} |  7 ++++---
 docker/Dockerfile.py                          |  4 ++--
 docker/Dockerfile2.py                         | 19 ++++++-------------
 linux-live/minioslib                          | 11 +++++++----
 6 files changed, 26 insertions(+), 38 deletions(-)
 delete mode 100644 docker/Dockerfile.minios-live
 create mode 100644 docker/Dockerfile.minios-live-container
 rename docker/{Dockerfile.minios-live.0@install.sh => Dockerfile.minios-live-container.0@install.sh} (89%)

diff --git a/docker/Dockerfile.minios-live b/docker/Dockerfile.minios-live
deleted file mode 100644
index a54b345..0000000
--- a/docker/Dockerfile.minios-live
+++ /dev/null
@@ -1,16 +0,0 @@
-
-FROM ubuntu:focal
-COPY Dockerfile.minios-live.0@install.sh /opt/install.sh
-RUN chmod +x /opt/install.sh
-RUN /opt/install.sh
-RUN rm /opt/install.sh
-ENV LOGPATH="/var/log"
-ENV BUILD_TEST_ISO="0"
-ENV DEV_SYSTEM="0"
-ENV CREATE_BACKUP="0"
-ENV DEBIAN_FRONTEND_TYPE="noninteractive"
-ENV APT_CMD="apt-get"
-ENV APT_OPTIONS="-y"
-VOLUME /build
-WORKDIR /build
-CMD ["/build/minios-live/autoinstall", "-"]
\ No newline at end of file
diff --git a/docker/Dockerfile.minios-live-container b/docker/Dockerfile.minios-live-container
new file mode 100644
index 0000000..4d1f61c
--- /dev/null
+++ b/docker/Dockerfile.minios-live-container
@@ -0,0 +1,7 @@
+
+FROM ubuntu:focal
+COPY Dockerfile.minios-live-container.0@install.sh /opt/install.sh
+RUN chmod +x /opt/install.sh && /opt/install.sh && rm /opt/install.sh
+VOLUME /build
+WORKDIR /build/minios-live
+CMD ["/build/minios-live/autoinstall", "-"]
\ No newline at end of file
diff --git a/docker/Dockerfile.minios-live.0@install.sh b/docker/Dockerfile.minios-live-container.0@install.sh
similarity index 89%
rename from docker/Dockerfile.minios-live.0@install.sh
rename to docker/Dockerfile.minios-live-container.0@install.sh
index 2e36ad0..1abf3a5 100755
--- a/docker/Dockerfile.minios-live.0@install.sh
+++ b/docker/Dockerfile.minios-live-container.0@install.sh
@@ -9,9 +9,10 @@ trap '_failure ${LINENO} "$BASH_COMMAND"' ERR
 # ############################################################################ #
 
 
+touch /.minios-live-container
 apt-get update -y
-apt-get install -y wget patch sudo debootstrap xorriso
-touch /minios-live-container
+apt-get install -y sudo debootstrap xorriso
+: 'apt-get install -y wget patch sudo debootstrap xorriso
 cd /opt/
 wget -c http://ru.archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.123ubuntu2_all.deb
 dpkg -i /opt/debootstrap_1.0.123ubuntu2_all.deb
@@ -33,7 +34,7 @@ cat <<'EOF' >/usr/share/debootstrap/functions.diff
 
 EOF
 cd /usr/share/debootstrap/
-patch </usr/share/debootstrap/functions.diff
+patch </usr/share/debootstrap/functions.diff '
 apt-get clean
 find /var/log/ -type f | xargs rm -f
 rm -f /var/backups/*
diff --git a/docker/Dockerfile.py b/docker/Dockerfile.py
index 0ada1af..4846041 100755
--- a/docker/Dockerfile.py
+++ b/docker/Dockerfile.py
@@ -13,7 +13,7 @@ class DockerFile(pydocker.DockerFile):
     """   add here your custom features   """
 
 
-d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live:latest')
+d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live-container:latest')
 
 d.RUN_bash_script('/opt/install.sh', r'''
 apt-get update -y
@@ -68,7 +68,7 @@ d.ENV = 'APT_CMD="apt-get"'
 d.ENV = 'APT_OPTIONS="-y"'
 
 d.VOLUME = '/build'
-d.WORKDIR = '/build'
+d.WORKDIR = '/build/minios-live'
 
 # d.ENTRYPOINT = ["/opt/www-data/entrypoint.sh"]
 d.CMD = ["/opt/minios-live/autoinstall", "-"]
diff --git a/docker/Dockerfile2.py b/docker/Dockerfile2.py
index 37f1bb0..bf6671e 100755
--- a/docker/Dockerfile2.py
+++ b/docker/Dockerfile2.py
@@ -13,12 +13,13 @@ class DockerFile(pydocker.DockerFile):
     """   add here your custom features   """
 
 
-d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live:latest')
+d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live-container:latest')
 
 d.RUN_bash_script('/opt/install.sh', r'''
+touch /.minios-live-container
 apt-get update -y
-apt-get install -y wget patch sudo debootstrap xorriso
-touch /minios-live-container
+apt-get install -y sudo debootstrap xorriso
+: 'apt-get install -y wget patch sudo debootstrap xorriso
 cd /opt/
 wget -c http://ru.archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.123ubuntu2_all.deb
 dpkg -i /opt/debootstrap_1.0.123ubuntu2_all.deb
@@ -40,7 +41,7 @@ cat <<'EOF' >/usr/share/debootstrap/functions.diff
 
 EOF
 cd /usr/share/debootstrap/
-patch </usr/share/debootstrap/functions.diff
+patch </usr/share/debootstrap/functions.diff '
 apt-get clean
 find /var/log/ -type f | xargs rm -f
 rm -f /var/backups/*
@@ -58,16 +59,8 @@ rm -f /var/lib/apt/lists/deb.*
 rm -f /var/lib/dpkg/*-old
 ''')
 
-d.ENV = 'LOGPATH="/var/log"'
-d.ENV = 'BUILD_TEST_ISO="0"'
-d.ENV = 'DEV_SYSTEM="0"'
-d.ENV = 'CREATE_BACKUP="0"'
-d.ENV = 'DEBIAN_FRONTEND_TYPE="noninteractive"'
-d.ENV = 'APT_CMD="apt-get"'
-d.ENV = 'APT_OPTIONS="-y"'
-
 d.VOLUME = '/build'
-d.WORKDIR = '/build'
+d.WORKDIR = '/build/minios-live'
 
 # d.ENTRYPOINT = ["/opt/www-data/entrypoint.sh"]
 d.CMD = ["/build/minios-live/autoinstall", "-"]
diff --git a/linux-live/minioslib b/linux-live/minioslib
index d1fd3ff..84c9c99 100644
--- a/linux-live/minioslib
+++ b/linux-live/minioslib
@@ -18,10 +18,10 @@ function common_variables() {
 		container=""
 	fi
 	set -u
-	if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
+	: 'if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
 		OUTPUT="/dev/stdout"
 		#CONTAINER="docker"
-	fi
+	fi'
 	if [ -f /.dockerenv ] || [ "$container" = "podman" ] && [ ! -d /opt/minios-live ] && [ ! -f /.minios-live-container ]; then
 		CONTAINER_TYPE="1"
 	fi
@@ -738,7 +738,9 @@ function chroot_setup_host() {
 function hostreq_pkg_list() {
 	echo -e "${YELLOW}=====> installing required software for host system ...${ENDCOLOUR}"
 	$APT_CMD update >>$OUTPUT 2>&1
-	if [ $CONTAINER_TYPE = "1" ]; then
+
+	# we need this only for trusty container
+	: 'if [ $CONTAINER_TYPE = "1" ]; then
 		touch /.minios-live
 		$APT_CMD install -y wget patch >>$OUTPUT 2>&1
 		cd ~
@@ -762,7 +764,8 @@ function hostreq_pkg_list() {
 EOF
 		cd /usr/share/debootstrap/
 		patch </usr/share/debootstrap/functions.diff
-	fi
+	fi'
+
 	if [ -f $SCRIPT_DIR/linux-live/pkglists/hostreq.list ]; then
 		#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
 		$APT_CMD install -y \