Use multi-stage Docker to download restic

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

.gitignore

@@ -31,7 +31,3 @@ _testmain.go
 
 /bin
 /.go
-/.push-*
-/.container-*
-/.dockerfile-*
-/.idea

Dockerfile.dbg

@@ -1,5 +1,26 @@
+FROM debian:stretch
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
+
+RUN set -x \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl bzip2
+
+RUN set -x                                                                                                                                                     \
+  && curl -Lo restic.bz2 https://github.com/restic/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2                          \
+  && bzip2 -d restic.bz2                                                                                                                                       \
+  && chmod 755 restic                                                                                                                                          \
+  && curl -Lo restic_{NEW_RESTIC_VER}.bz2 https://github.com/restic/restic/releases/download/v{NEW_RESTIC_VER}/restic_{NEW_RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \
+  && bzip2 -d restic_{NEW_RESTIC_VER}.bz2                                                                                                                      \
+  && chmod 755 restic_{NEW_RESTIC_VER}
+
+
+
 FROM {ARG_FROM}
 
-ADD bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN}
+COPY --from=0 restic /bin/restic
+COPY --from=0 restic_{NEW_RESTIC_VER} /bin/restic_{NEW_RESTIC_VER}
+COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN}
 
 ENTRYPOINT ["/{ARG_BIN}"]

Dockerfile.in

@@ -1,6 +1,26 @@
+FROM debian:stretch
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
+
+RUN set -x \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl bzip2
+
+RUN set -x                                                                                                                                                     \
+  && curl -Lo restic.bz2 https://github.com/restic/restic/releases/download/v{RESTIC_VER}/restic_{RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2                          \
+  && bzip2 -d restic.bz2                                                                                                                                       \
+  && chmod 755 restic                                                                                                                                          \
+  && curl -Lo restic_{NEW_RESTIC_VER}.bz2 https://github.com/restic/restic/releases/download/v{NEW_RESTIC_VER}/restic_{NEW_RESTIC_VER}_{ARG_OS}_{ARG_ARCH}.bz2 \
+  && bzip2 -d restic_{NEW_RESTIC_VER}.bz2                                                                                                                      \
+  && chmod 755 restic_{NEW_RESTIC_VER}
+
+
 FROM {ARG_FROM}
 
-ADD bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN}
+COPY --from=0 /restic /bin/restic
+COPY --from=0 /restic_{NEW_RESTIC_VER} /bin/restic_{NEW_RESTIC_VER}
+COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN}
 
 # This would be nicer as `nobody:nobody` but distroless has no such entries.
 USER 65535:65535

Makefile

@@ -27,6 +27,10 @@ else
 	endif
 endif
 
+RESTIC_VER       := 0.8.3
+# also update in restic wrapper library
+NEW_RESTIC_VER   := 0.9.5
+
 ###
 ### These variables should not need tweaking.
 ###
@@ -176,11 +180,13 @@ DOTFILE_IMAGE    = $(subst /,_,$(IMAGE))-$(TAG)
 container: bin/.container-$(DOTFILE_IMAGE)-PROD bin/.container-$(DOTFILE_IMAGE)-DBG
 bin/.container-$(DOTFILE_IMAGE)-%: bin/$(OS)_$(ARCH)/$(BIN) $(DOCKERFILE_%)
 	@echo "container: $(IMAGE):$(TAG_$*)"
-	@sed                                    \
-	    -e 's|{ARG_BIN}|$(BIN)|g'           \
-	    -e 's|{ARG_ARCH}|$(ARCH)|g'         \
-	    -e 's|{ARG_OS}|$(OS)|g'             \
-	    -e 's|{ARG_FROM}|$(BASEIMAGE_$*)|g' \
+	@sed                                            \
+	    -e 's|{ARG_BIN}|$(BIN)|g'                   \
+	    -e 's|{ARG_ARCH}|$(ARCH)|g'                 \
+	    -e 's|{ARG_OS}|$(OS)|g'                     \
+	    -e 's|{ARG_FROM}|$(BASEIMAGE_$*)|g'         \
+	    -e 's|{RESTIC_VER}|$(RESTIC_VER)|g'         \
+	    -e 's|{NEW_RESTIC_VER}|$(NEW_RESTIC_VER)|g' \
 	    $(DOCKERFILE_$*) > bin/.dockerfile-$*-$(OS)_$(ARCH)
 	@docker build -t $(IMAGE):$(TAG_$*) -f bin/.dockerfile-$*-$(OS)_$(ARCH) .
 	@docker images -q $(IMAGE):$(TAG_$*) > $@