Merge pull request #4 from sigdba/develop

Added docker-in-docker feature

Author: dboitnot

build/docker_launch.sh

@@ -29,6 +29,14 @@ cp -R /root/.oh-my-zsh $USER_HOME
 chown -R $HOST_UID:$HOST_GID $USER_HOME
 ln -s /home/user /home/$HOST_USERNAME
 
+# Check for Docker-in-Docker and set user permissions
+ds="/var/run/docker.sock"
+if [ -S $ds ]; then
+  dgid=$(stat -c '%g' $ds)
+  grep -q "$dgid" /etc/group || groupadd -g "$dgid" dddocker
+  usermod -aG "$dgid" "$HOST_USERNAME"
+fi
+
 # su user -c /bin/bash
 # su -l -c /bin/bash user
 su - "$HOST_USERNAME"

build/feature_docker.sh

@@ -0,0 +1 @@
+apt-get install -y docker.io || die "error install docker"

docker-dev.sh

@@ -98,6 +98,17 @@ else
   DOCKER_OPTS="$DOCKER_OPTS -e AWS_PROFILE=$SITE_NAME"
 fi
 
+if echo "$DOCKERDEV_FEATURES" |grep -q docker; then
+  echo "Docker-in-Docker feature enabled"
+  ds=/var/run/docker.sock
+  if [ -S "$ds" ]; then
+    echo "Mounting Docker socket within container."
+    DOCKER_OPTS="$DOCKER_OPTS -v $ds:$ds"
+  else
+    echo "Docker socket not found. Docker will not be available within the container."
+  fi
+fi
+
 # DOCKER_OPTS="$DOCKER_OPTS -u 0:1000"
 
 #