Merge pull request #32 from vieux/update_make

use multistage builds

Author: vieux

.travis/integration.sh

@@ -3,47 +3,55 @@
 set -e
 set -x
 
+TAG=test
+
+# before_install
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+sudo apt-get update
+sudo apt-get -y install docker-ce
+
 # install
 docker pull rastasheep/ubuntu-sshd:14.04
 docker pull busybox
 
 #script
 
 # make the plugin
-make
+PLUGIN_TAG=$TAG make
 # enable the plugin
-make enable
+docker plugin enable vieux/sshfs:$TAG
 # list plugins
 docker plugin ls
 # start sshd
 docker run -d -p 2222:22 rastasheep/ubuntu-sshd:14.04
 
 # test1: simple
-docker volume create -d vieux/sshfs:next -o sshcmd=root@localhost:/ -o port=2222 -o password=root sshvolume
+docker volume create -d vieux/sshfs:$TAG -o sshcmd=root@localhost:/ -o port=2222 -o password=root sshvolume
 docker run --rm -v sshvolume:/write busybox sh -c "echo hello > /write/world"
 docker run --rm -v sshvolume:/read busybox grep -Fxq hello /read/world
 sudo cat /var/lib/docker/plugins/sshfs-state.json
 docker volume rm sshvolume
 
 # test2: allow_other
-docker volume create -d vieux/sshfs:next -o sshcmd=root@localhost:/ -o allow_other -o port=2222 -o password=root sshvolume
+docker volume create -d vieux/sshfs:$TAG -o sshcmd=root@localhost:/ -o allow_other -o port=2222 -o password=root sshvolume
 docker run --rm -v sshvolume:/write -u nobody busybox sh -c "echo hello > /write/world"
 docker run --rm -v sshvolume:/read -u nobody busybox grep -Fxq hello /read/world
 sudo cat /var/lib/docker/plugins/sshfs-state.json
 docker volume rm sshvolume
 
 # test3: compression
-docker volume create -d vieux/sshfs:next -o sshcmd=root@localhost:/ -o Ciphers=arcfour -o Compression=no -o port=2222 -o password=root sshvolume
+docker volume create -d vieux/sshfs:$TAG -o sshcmd=root@localhost:/ -o Ciphers=arcfour -o Compression=no -o port=2222 -o password=root sshvolume
 docker run --rm -v sshvolume:/write busybox sh -c "echo hello > /write/world"
 docker run --rm -v sshvolume:/read busybox grep -Fxq hello /read/world
 sudo cat /var/lib/docker/plugins/sshfs-state.json
 docker volume rm sshvolume
 
 # test4: source
-docker plugin disable vieux/sshfs:next
-docker plugin set vieux/sshfs:next state.source=/tmp
-docker plugin enable vieux/sshfs:next
-docker volume create -d vieux/sshfs:next -o sshcmd=root@localhost:/ -o Ciphers=arcfour -o Compression=no -o port=2222 -o password=root sshvolume
+docker plugin disable vieux/sshfs:$TAG
+docker plugin set vieux/sshfs:$TAG state.source=/tmp
+docker plugin enable vieux/sshfs:$TAG
+docker volume create -d vieux/sshfs:$TAG -o sshcmd=root@localhost:/ -o Ciphers=arcfour -o Compression=no -o port=2222 -o password=root sshvolume
 docker run --rm -v sshvolume:/write busybox sh -c "echo hello > /write/world"
 docker run --rm -v sshvolume:/read busybox grep -Fxq hello /read/world
 sudo cat /tmp/sshfs-state.json

Dockerfile

@@ -1,9 +1,15 @@
-FROM alpine
+FROM golang:1.9-alpine as builder
+COPY . /go/src/github.com/vieux/docker-volume-sshfs
+WORKDIR /go/src/github.com/vieux/docker-volume-sshfs
+RUN set -ex \
+    && apk add --no-cache --virtual .build-deps \
+    gcc libc-dev \
+    && go install --ldflags '-extldflags "-static"' \
+    && apk del .build-deps
+CMD ["/go/bin/docker-volume-sshfs"]
 
+FROM alpine
 RUN apk update && apk add sshfs
-
 RUN mkdir -p /run/docker/plugins /mnt/state /mnt/volumes
-
-COPY docker-volume-sshfs docker-volume-sshfs
-
+COPY --from=builder /go/bin/docker-volume-sshfs .
 CMD ["docker-volume-sshfs"]

Dockerfile.dev

@@ -1,24 +1,15 @@
-PLUGIN_NAME=vieux/sshfs
-PLUGIN_TAG=next
+PLUGIN_NAME = vieux/sshfs
+PLUGIN_TAG ?= next
 
-all: clean docker rootfs create
+all: clean rootfs create
 
 clean:
 	@echo "### rm ./plugin"
 	@rm -rf ./plugin
 
-docker:
-	@echo "### docker build: builder image"
-	@docker build -q -t builder -f Dockerfile.dev .
-	@echo "### extract docker-volume-sshfs"
-	@docker create --name tmp builder
-	@docker cp tmp:/go/bin/docker-volume-sshfs .
-	@docker rm -vf tmp
-	@docker rmi builder
+rootfs:
 	@echo "### docker build: rootfs image with docker-volume-sshfs"
 	@docker build -q -t ${PLUGIN_NAME}:rootfs .
-
-rootfs:
 	@echo "### create rootfs directory in ./plugin/rootfs"
 	@mkdir -p ./plugin/rootfs
 	@docker create --name tmp ${PLUGIN_NAME}:rootfs
@@ -33,10 +24,6 @@ create:
 	@echo "### create new plugin ${PLUGIN_NAME}:${PLUGIN_TAG} from ./plugin"
 	@docker plugin create ${PLUGIN_NAME}:${PLUGIN_TAG} ./plugin
 
-enable:
-	@echo "### enable plugin ${PLUGIN_NAME}:${PLUGIN_TAG}"
-	@docker plugin enable ${PLUGIN_NAME}:${PLUGIN_TAG}
-
 push:  clean docker rootfs create enable
 	@echo "### push plugin ${PLUGIN_NAME}:${PLUGIN_TAG}"
 	@docker plugin push ${PLUGIN_NAME}:${PLUGIN_TAG}