From 40fc1a166f0ebbb9344f626fdaec8fd9cf76caa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <cgonzalez@opennebula.io>
Date: Fri, 26 Mar 2021 16:28:50 +0100
Subject: [PATCH] M #: enable rc_sys autodetect for DH images (#1036)

---
 src/datastore_mad/remotes/docker_downloader.sh         | 3 ++-
 src/datastore_mad/remotes/dockerhub/dockerfiles/alpine | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/datastore_mad/remotes/docker_downloader.sh b/src/datastore_mad/remotes/docker_downloader.sh
index 917a735206..9f464884f0 100755
--- a/src/datastore_mad/remotes/docker_downloader.sh
+++ b/src/datastore_mad/remotes/docker_downloader.sh
@@ -205,7 +205,8 @@ image_id=$(docker images -q one"$sid")
 #-------------------------------------------------------------------------------
 # Flatten container image
 #-------------------------------------------------------------------------------
-container_id=$(docker run -d "$image_id" /bin/true)
+# rm -f /.dockerenv to avoid external tools to autodetect as docker images
+container_id=$(docker run -d "$image_id" rm -f /.dockerenv)
 
 docker export -o "$tarball" "$container_id" > /dev/null 2>&1
 
diff --git a/src/datastore_mad/remotes/dockerhub/dockerfiles/alpine b/src/datastore_mad/remotes/dockerhub/dockerfiles/alpine
index da0bee051e..f628a7c38e 100644
--- a/src/datastore_mad/remotes/dockerhub/dockerfiles/alpine
+++ b/src/datastore_mad/remotes/dockerhub/dockerfiles/alpine
@@ -19,4 +19,4 @@ RUN rc-update add sshd default && \
     rc-update add udev default && \
     rc-update add networking default
 
-RUN echo 'rc_sys=""' >> /etc/rc.conf
+RUN sed -i '/rc_sys/s/^/#/' /etc/rc.conf