fix: add tini to docker images to reap rclone processes left behind by restic

Author: garethgeorge

Dockerfile.alpine

@@ -1,9 +1,9 @@
 FROM alpine:latest
-RUN apk --no-cache add ca-certificates curl bash rclone openssh tzdata
+RUN apk --no-cache add tini ca-certificates curl bash rclone openssh tzdata
 RUN mkdir -p /tmp
 COPY backrest /backrest
 RUN /backrest --install-deps-only
 RUN mkdir -p /bin && mv /root/.local/share/backrest/* /bin
 
-ENTRYPOINT ["/backrest"]
-RUN /backrest --install-deps-only
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["/backrest"]

Dockerfile.scratch

@@ -1,13 +1,16 @@
-FROM golang:alpine as gobuild
+FROM alpine:latest AS alpine
+RUN apk add --no-cache ca-certificates tini-static
 RUN mkdir /tmp-orig
 COPY backrest /backrest
 RUN /backrest --install-deps-only
 RUN mkdir -p /bin && mv /root/.local/share/backrest/* /bin
 
 FROM scratch 
-COPY --from=gobuild /tmp-orig /tmp
-COPY --from=gobuild /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=gobuild /bin /bin
+COPY --from=alpine /tmp-orig /tmp
+COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=alpine /bin /bin
+COPY --from=alpine /sbin/tini-static /tini
+COPY backrest /backrest
 
-ENTRYPOINT ["/backrest"]
-COPY backrest /backrest
+ENTRYPOINT ["/tini", "--"]
+CMD ["/backrest"]