fix

Author: erik-romson

.gitignore

@@ -0,0 +1,2 @@
+.idea
+*.iml

Dockerfile

@@ -51,8 +51,10 @@ RUN apt-get -y install git bash-completion git-flow gitk tig && \
 #=============================================
 # Install java12
 #=============================================
-RUN apt-get install -y openjdk-12-jdk && \
+RUN apt-get install -y openjdk-11-jdk && \
     apt-get clean
+#RUN apt-get install -y openjdk-12-jdk && \
+#    apt-get clean
 
 #=============================================
 # Install go
@@ -190,6 +192,9 @@ RUN chmod go-w /usr /usr/bin && find /usr/bin/ -name "*" -exec chmod a+x {} \;
 RUN /usr/bin/config-append
 RUN rm -rf /tmp/*
 
+RUN apt-get install -y maven
+
+
 #=============================================
 # Bootstrap image
 #=============================================

build.sh

@@ -1,5 +1,5 @@
 export CONTAINER=devbox
-export IMAGE=docker.pkg.github.com/oysteinlunde/devbox/devbox:latest
+export IMAGE=docker.pkg.github.com/erik-romson/devbox/devbox:latest
 export DEVBOX_IP=127.0.0.2
 export PORTS=$(docker inspect --format='{{.Config.ExposedPorts}}' $IMAGE | sed -e 's#[^ 0-9]##g')
 export HOME_VOLUME=devbox-home

container-props.ini

@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>devbox</groupId>
+    <artifactId>devbox</artifactId>
+    <packaging>pom</packaging>
+    <name>devbox Docker Pom</name>
+    <url>http://mtshub.com/</url>
+    <properties>
+    </properties>
+    <version>0-SNAPSHOT</version>
+<!--    <groupId>io.fabric8</groupId>-->
+<!--    <artifactId>docker-maven-plugin</artifactId>-->
+<!--    <version>${docker-maven-plugin.version}</version>-->
+
+
+
+</project>
+

login.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 source container-props.ini
 
+SCRIPT_FOR_USER=$USER
+
 #echo "set CONTAINER=$CONTAINER" > $SCRIPT_DIR/cmd/container-props.cmd
 
 if [ "$1" = "-h" ]; then
@@ -47,7 +49,8 @@ if [ "$1" != "-o" -a "$1" != "-l" ];then
 fi
 
 # Run image
-docker run --privileged --rm -d  -it -h devbox $PORT_MAPS $HOST_MAPS -e PORTS="$PORTS" -e DEVBOXUSER=$USER -v /var/run/docker.sock:/var/run/docker.sock -v /c:/mnt/c:consistent  -v $HOME_VOLUME:/home --name $CONTAINER $IMAGE
+#docker run --privileged --rm -d  -it -h devbox $PORT_MAPS $HOST_MAPS -e PORTS="$PORTS" -e DEVBOXUSER=$SCRIPT_FOR_USER -v /var/run/docker.sock:/var/run/docker.sock -v /c:/mnt/c:consistent  -v $HOME_VOLUME:/home --name $CONTAINER $IMAGE
+docker run --privileged --rm -d  -it -h devbox $PORT_MAPS $HOST_MAPS -e PORTS="$PORTS" -e "DOCKER_HOST=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')" -e DEVBOXUSER=$SCRIPT_FOR_USER -v /var/run/docker.sock:/var/run/docker.sock   -v ~/.ssh:/home/$USER/.ssh -v $HOME_VOLUME:/home --name $CONTAINER $IMAGE
 
 echo Starting $CONTAINER ...
 
@@ -59,13 +62,13 @@ echo
 
 $SCRIPT_DIR/login.sh
 
-#docker exec --user $USER -t -i devbox /usr/bin/ttyd-boot.sh
+#docker exec --user $SCRIPT_FOR_USER -t -i devbox /usr/bin/ttyd-boot.sh
 
 #./init-ssh.sh
 
 #for SERVER in devbox $DEVBOX_IP
 #do
-#	ssh-keygen -q -f "/home/$USER/.ssh/known_hosts" -R $SERVER &> /dev/null
+#	ssh-keygen -q -f "/home/$SCRIPT_FOR_USER/.ssh/known_hosts" -R $SERVER &> /dev/null
 #	ssh -o StrictHostKeyChecking=no $SERVER exit &> /dev/null
 #done