Multi-arch Dockerfile

proxy-ssllibev/proxy-ssllibev.sh

@@ -19,7 +19,7 @@ CTNNAME="proxy-ssllibev"
 #if [ "$BIMG" = "0" ] || [ "$TDKFILE" -gt "$TIMG" ] || [ "$TENVSSLL" -gt "$TIMG" ]; then
 	case $ARCH in
 		armv6l|armv7l)
-			TARGET=arm32v6
+			TARGET=arm
 			;;
 		x86_64|i686|i386)
 			TARGET=amd64

vlp

@@ -11,8 +11,6 @@ ARCH=`uname -m`
 DKUID=`id -u`
 DKGID=`id -g`
 IMGNAME="samuelhbne/vpnlaunchpad"
-IMGVER="$ARCH.$DKUID.$DKGID"
-IMGTAG="$IMGNAME:$IMGVER"
 
 DKVER=`docker -v 2>/dev/null|awk '{print $3}'`
 if [ "$DKVER" = "" ]; then
@@ -39,25 +37,23 @@ fi
 BUILD=1
 
 if [ "$BUILD" = "1" ]; then
-	cp -a $VLPDKDIR/Dockerfile.in $VLPDKDIR/Dockerfile
 	case $ARCH in
 		armv6l|armv7l)
-			sed -i.bak  's/^FROM .*/FROM arm32v6\/alpine/g' $VLPDKDIR/Dockerfile
-			rm -rf $VLPDKDIR/Dockerfile.bak
+			TARGET=arm
 			;;
 		x86_64|i686|i386)
-			sed -i.bak  's/^FROM .*/FROM alpine/g' $VLPDKDIR/Dockerfile
-			rm -rf $VLPDKDIR/Dockerfile.bak
+			TARGET=amd64
 			;;
 		*)
 			echo "Unsupported arch"
 			exit
 			;;
 	esac
+	cp -a $VLPDKDIR/Dockerfile.$TARGET $VLPDKDIR/Dockerfile
 	sed -i.bak "s/^ENV DKUID .*/ENV DKUID ${DKUID}/" $VLPDKDIR/Dockerfile && rm -rf $VLPDKDIR/Dockerfile.bak
 	sed -i.bak "s/^ENV DKGID .*/ENV DKGID ${DKGID}/" $VLPDKDIR/Dockerfile && rm -rf $VLPDKDIR/Dockerfile.bak
 	echo "Building vpnlaunchpad image..."
-	docker build --rm=true -t $IMGTAG $VLPDKDIR/
+	docker build --rm=true -t $IMGNAME:$TARGET.$DKUID.$DKGID $VLPDKDIR/
 	echo
 fi
 
@@ -67,7 +63,7 @@ if [ "$BPROFILE" = "" ]; then
         echo -e "[profile $PROFILE]\nregion = ap-northeast-1\noutput = json">>$VLPHOME/.aws/config
 fi
 
-DOCKERCMD="docker run --user $DKUID:$DKGID --rm=true -v $VLPHOME:/home/vlp -it $IMGTAG"
+DOCKERCMD="docker run --user $DKUID:$DKGID --rm=true -v $VLPHOME:/home/vlp -it $IMGNAME:$TARGET.$DKUID.$DKGID"
 
 if [[ $# = 0 ]]; then
 	$DOCKERCMD /home/vlp/bin/vlp-menu

vpnlaunchpad/Dockerfile.amd64

@@ -0,0 +1,17 @@
+FROM alpine
+
+MAINTAINER Samuel Huang "samuelh2006@gmail.com"
+
+ENV DKUID 1000
+ENV DKGID 1000
+
+# Work around with gid conflict between OSX and Alpine
+# MacOSX: gid=20(staff)
+# Alpine: gid=20(dialout)
+
+RUN if [ "$(getent group ${DKGID}|cut -d":" -f1)" == "" ]; then addgroup -g ${DKGID} vlp; fi
+RUN adduser -G `getent group ${DKGID}|cut -d":" -f1` -u ${DKUID} -s /bin/ash -h /home/vlp -D vlp
+
+RUN apk update && apk add git openssh gcc musl-dev libffi-dev openssl-dev make bash py-pip pwgen bc npm
+RUN npm install -g qrcode-terminal
+RUN pip install awscli