diff --git a/.gitignore b/.gitignore index f1c181ec9c5c921245027c6b452ecfc1d3626364..cb26edc8987e9c4416ffad744b62eafe9b41ada8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,7 @@ # Output of the go coverage tool, specifically when used with LiteIDE *.out + +*dapper* +!Dockerfile.dapper +bin/ \ No newline at end of file diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 98ddb2c8a821346f43b08bfed65626720a33f85f..809ad154d99b0c7150a186bb3f4b86224d7246a8 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -19,8 +19,8 @@ RUN wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${ARCH} \ GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash -RUN wget -O - https://storage.googleapis.com/golang/go1.11.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \ - go get github.com/rancher/trash && go get github.com/golang/lint/golint +RUN wget -O - https://storage.googleapis.com/golang/go1.12.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local +RUN go get github.com/rancher/trash && go get golang.org/x/lint/golint ENV DAPPER_SOURCE /go/src/github.com/rancher/local-path-provisioner ENV DAPPER_OUTPUT ./bin diff --git a/package/Dockerfile b/package/Dockerfile index 47b6353f7cbb626317c0b66c131d38a527b157e7..042162e51c595bd75dc8e83c9938e208b4b7cf66 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -1,8 +1,5 @@ -FROM ubuntu:16.04 +FROM alpine:latest -RUN apt-get update && apt-get install -y curl vim nfs-common iproute dnsutils iputils-ping telnet +COPY bin /bin -COPY bin /usr/local/sbin/ - -VOLUME /usr/local/sbin -CMD ["local-path-provisioner"] +ENTRYPOINT ["/bin/local-path-provisioner"] diff --git a/scripts/build b/scripts/build index 12f20ef6021014c7bfad5f2abf27ddd146f72968..7ae6e279f42f92a566d24af8bfd9a377c6c2064a 100755 --- a/scripts/build +++ b/scripts/build @@ -5,5 +5,5 @@ cd $(dirname $0)/.. VERSION=${VERSION:-$(./scripts/version)} mkdir -p bin -[ "$(uname)" != "Darwin" ] && LINKFLAGS="-extldflags -static -s" +[ "$(uname)" != "Darwin" ] && LINKFLAGS="-extldflags -static -s -w" CGO_ENABLED=0 go build -ldflags "-X main.VERSION=$VERSION $LINKFLAGS" -o bin/local-path-provisioner