Update Base to Ubuntu 16.04

disable ipv6 internally

Dockerfile.unifi5

@@ -1,23 +1,21 @@
-FROM ubuntu:trusty
+FROM ubuntu:16.04
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN mkdir -p /usr/lib/unifi/data /backups /logs 
+RUN mkdir -p /usr/lib/unifi/data /backups /logs
 
 # add unifi repo +keys
-RUN \
-	echo "deb http://www.ubnt.com/downloads/unifi/debian unifi5 ubiquiti" >/etc/apt/sources.list.d/ubnt.list && \
-	apt-key adv --keyserver keyserver.ubuntu.com --recv C0A52C50
+RUN echo "deb http://www.ubnt.com/downloads/unifi/debian unifi5 ubiquiti" >/etc/apt/sources.list.d/ubnt.list && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv C0A52C50
 
 # update then install
-RUN \
-    apt-get update -q -y && \
-    apt-get install -q -y mongodb-server unifi lsof
+RUN apt-get update -q -y && \
+    apt-get install -q -y mongodb-server unifi lsof anacron vim net-tools less
 
 #add scripts
 COPY ["unifi.sh","backup_unifi.sh","restore_unifi.sh", "/usr/lib/unifi/"]
 RUN echo "10 02 * * * root /usr/lib/unifi/backup_unifi.sh >/logs/backup.log 2>&1" >/etc/cron.d/unifi_backup
 
-#redirect path
+#redirect logs and backup
 RUN rm -f /usr/lib/unifi/logs && ln -s /logs /usr/lib/unifi/logs
 RUN rm -f /usr/lib/unifi/backups && ln -s /backups /usr/lib/unifi/backups
 
@@ -25,5 +23,8 @@ RUN rm -f /usr/lib/unifi/backups && ln -s /backups /usr/lib/unifi/backups
 VOLUME /usr/lib/unifi/data
 VOLUME /backups /logs
 EXPOSE  8443 8880 8080 27117
+
+#Runtime Env
+ENV PATH "$PATH:/usr/lib/unifi"
 WORKDIR /usr/lib/unifi
 CMD ["/usr/lib/unifi/unifi.sh", "start"]

build_unifi.sh

@@ -1,11 +1,16 @@
 #!/bin/bash
+VERSION=5.2.9
 VMNAME=${1:-unifi5}
 if [ -r Dockerfile.$VMNAME ]; then
-DOCKER_USER=${DOCKER_USER:-tommi2day}
-#build the container
-docker stop $VMNAME 
-docker rm $VMNAME 
-docker build -t $DOCKER_USER/$VMNAME -f Dockerfile.$VMNAME .
+	DOCKER_USER=${DOCKER_USER:-tommi2day}
+	#build the container
+	docker stop $VMNAME 
+	docker rm $VMNAME 
+	docker build -t $DOCKER_USER/$VMNAME:$VERSION -f Dockerfile.$VMNAME . |tee build.log 
+	IMAGE=$(awk  '/^Successfully/ {print $3}' build.log)
+	if [ -n "$IMAGE" ]; then
+		docker tag $IMAGE $DOCKER_USER/$VMNAME:latest
+	fi
 else 
 	echo "Usage: $0 VMNAME #Dockerfile.VMNAME must exists"
 fi

run_unifi.sh

@@ -20,9 +20,9 @@ fi
 RUNNING=$($DOCKER inspect --format="{{ .State.Running }}" $VMNAME 2> /dev/null)
 if [ $? -eq 0 ]; then
 	if [ "$RUNNING" == "true" ]; then
-		$DOCKER stop $VMNAME
+		$DOCKER stop $VMNAME >/dev/null 2>&1
 	fi
-	$DOCKER rm $VMNAME
+	$DOCKER rm $VMNAME >/dev/null 2>&1
 fi
 
 if [ "$DEBUG" = "clean" ]; then
@@ -31,32 +31,40 @@ if [ "$DEBUG" = "clean" ]; then
 	$DOCKER volume rm  ${VMNAME}_data >/dev/null 2>&1
 fi
 
-#check data volume and create a new one if needed
-DATA=$($DOCKER docker inspect --format '{{ .Mountpoint }}' ${VMNAME}_data 2> /dev/null)
-if [ $? -ne 0 ]; then
-	docker volume create --name ${VMNAME}_data
-fi
-
 #prepare shared dir
-for d in backups logs ; do
+for d in backups logs data; do
 	if [ ! -d $SHARED_DIR/$d ]; then
-			mkdir -p $SHARED_DIR/$d
+		mkdir -p $SHARED_DIR/$d
 	fi
 done
 
+
+#check data volume and create a new one if needed
+if [ "OSTYPE" = "msys" ]; then
+	#on windows use a volume
+	DATA=$($DOCKER docker inspect --format '{{ .Mountpoint }}' ${VMNAME}_data 2> /dev/null)
+	if [ $? -ne 0 ]; then
+		docker volume create --name ${VMNAME}_data --driver=local --
+	fi
+	DATA="${VMNAME}_data"
+else
+	DATA="${SHARED_DIR}/data"
+fi
+
+
 #run it
 echo "	
 $DOCKER run $RUN \
-  -v ${VMNAME}_data:/usr/lib/unifi/data  \
+  -v $DATA:/usr/lib/unifi/data  \
   -v "${SHARED_DIR}/backups":/backups \
   -v "${SHARED_DIR}/logs":/logs \
-	--hostname $VMNAME \
-	--name ${VMNAME} \
-	-p 8080:8080 \
-	-p 8880:8880 \
-	-p 8443:8443 \
-	-p 27117:27117 \
-	$DOCKER_USER/$VMNAME $1 " >starter
+  --hostname $VMNAME \
+  --name ${VMNAME} \
+  -p :8080:8080 \
+  -p 8880:8880 \
+  -p 8443:8443 \
+  -p 37117:27117 \
+  $DOCKER_USER/$VMNAME $1 " >starter
 if [ "$OSTYPE" = "msys" ]; then
 	mv starter starter.ps1
 	powershell -File starter.ps1

unifi.sh

@@ -2,20 +2,21 @@
 # description: Start Unify server
 # chkconfig: 2345 99 01
 
+#MEMORY="-Xmx256M"
 UNIFI=/usr/lib/unifi
 if [ ! -d $UNIFI ]; then
-	echo "Unifi not installed in $UNIFI"
-	exit 1
+        echo "Unifi not installed in $UNIFI"
+        exit 1
 fi
 cd $UNIFI
 case "$1" in
 
         start)
 
-								if [ ! -d logs ]; then
-									mkdir logs
-								fi
-                nohup java -Xmx256M -jar lib/ace.jar start >logs/unifi.log 2>&1 &
+                if [ ! -d logs ]; then
+                    mkdir logs
+                fi
+                nohup java -Djava.net.preferIPv4Stack=true $MEMORY -jar lib/ace.jar start >logs/unifi.log 2>&1 &
                 sleep 5
                 ./$0 status
                 tail -f logs/server.log