From 18eac680524c1a59cbcb6ffa60207cfbbcab45b0 Mon Sep 17 00:00:00 2001
From: Stefano Alberto Russo <stefano.russo@gmail.com>
Date: Thu, 4 Mar 2021 15:42:32 +0000
Subject: [PATCH] Added docker, ubuntu home, disabled prompt name.
---
XUbuntuDesktop/Dockerfile | 7 +++++++
XUbuntuDesktop/build.sh | 7 ++++++-
XUbuntuDesktop/files/entrypoint.sh | 4 ++--
XUbuntuDesktop/run.sh | 2 +-
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/XUbuntuDesktop/Dockerfile b/XUbuntuDesktop/Dockerfile
index 2e312db..0ba5e26 100644
--- a/XUbuntuDesktop/Dockerfile
+++ b/XUbuntuDesktop/Dockerfile
@@ -184,6 +184,11 @@ COPY files/eclipse128.png /opt/eclipse/eclipse128.png
COPY files/Eclipse.desktop /ubuntu_home_vanilla/Desktop/
RUN chown -R ubuntu:ubuntu /ubuntu_home_vanilla/Desktop/
+# Docker
+ARG DOCKER_GID
+RUN groupadd -g $DOCKER_GID docker
+RUN apt-get install docker.io -y
+RUN usermod -aG docker ubuntu
# Giveagain, since xfce install "fixed" it) write access to anyone to the home folder so the entrypoint
# will be able to copy over the /home/matauser_vanilla into /home/ubuntu (for Singularity)
@@ -208,3 +213,5 @@ USER ubuntu
# To access: expose 8590/tcp and 5900/tcp
ENV CONTAINER_NAME='xubuntudesktop'
+
+
diff --git a/XUbuntuDesktop/build.sh b/XUbuntuDesktop/build.sh
index 0876c08..f89f565 100755
--- a/XUbuntuDesktop/build.sh
+++ b/XUbuntuDesktop/build.sh
@@ -1,3 +1,8 @@
#!/bin/bash
-docker build . -t xubuntudesktop
+# Get host Docker group id
+DOCKER_GID=$(getent group docker | cut -d':' -f3)
+
+echo "Using host Docker group id : $DOCKER_GID"
+
+docker build --build-arg DOCKER_GID=$DOCKER_GID . -t xubuntudesktop
diff --git a/XUbuntuDesktop/files/entrypoint.sh b/XUbuntuDesktop/files/entrypoint.sh
index 0724a9c..09bbaf3 100644
--- a/XUbuntuDesktop/files/entrypoint.sh
+++ b/XUbuntuDesktop/files/entrypoint.sh
@@ -89,8 +89,8 @@ else
fi
- echo "[INFO] Setting new prompt @$CONTAINER_NAME container"
- echo 'export PS1="${debian_chroot:+($debian_chroot)}\u@$CONTAINER_NAME@\h:\w\$ "' >> /home/ubuntu/.bashrc
+ #echo "[INFO] Setting new prompt @$CONTAINER_NAME container"
+ #echo 'export PS1="${debian_chroot:+($debian_chroot)}\u@$CONTAINER_NAME@\h:\w\$ "' >> /home/ubuntu/.bashrc
diff --git a/XUbuntuDesktop/run.sh b/XUbuntuDesktop/run.sh
index d06db0b..a654e14 100755
--- a/XUbuntuDesktop/run.sh
+++ b/XUbuntuDesktop/run.sh
@@ -1,2 +1,2 @@
#!/bin/bash
-docker run -v$PWD/:/data -p8590:8590 -it xubuntudesktop
+docker run -v/home/ubuntu/:/home/ubuntu -v/var/run/docker.sock:/var/run/docker.sock -p8590:8590 -it xubuntudesktop
--
GitLab