From ae08297848033fa962b0d84f1d9fba477dfedd8c Mon Sep 17 00:00:00 2001
From: Mathias Gumz <mg@2hoch5.com>
Date: Sat, 25 Jan 2020 09:54:15 +0100
Subject: [PATCH 1/2] Upgrade rclone and base image

This commit bumps the packaged rclone version to v1.50.2. The changelog
for this release is available (here)[1]. The major changes (to
rclone-1.49.1) are addressing several memory leaks and more robustness.

This commit also bumps the base image version to Alpine-3.11.3.

In addition, the Dockerfile now uses opencontainers.org labels to
annotate the created container image.

[1]: https://github.com/rclone/rclone/blob/master/docs/content/changelog.md#v1502---2019-11-19
---
 Dockerfile | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0f05af7..56c490b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
-FROM alpine:3.10 as base
+FROM alpine:3.11.3 as base
+
+## build-stage
 
 FROM base as builder
-ARG VERSION=v1.49.1
+ARG VERSION=v1.50.2
 
 RUN wget https://github.com/ncw/rclone/releases/download/$VERSION/rclone-$VERSION-linux-amd64.zip
 RUN unzip rclone-$VERSION-linux-amd64.zip
@@ -10,9 +12,25 @@ RUN cd rclone-*-linux-amd64 && \
     chown root:root /usr/bin/rclone && \
     chmod 755 /usr/bin/rclone
 
+##
+## runtime-stage
+
 FROM base
 
-RUN apk --update --no-cache add ca-certificates inotify-tools lz4 zstd
+ARG VERSION=v1.50.2
+
+## https://github.com/opencontainers/image-spec/releases/tag/v1.0.1
+LABEL org.opencontainers.image.url="https://github.com/travelping/docker-rclone"
+LABEL org.opencontainers.image.source="https://github.com/travelping/docker-rclone"
+LABEL org.opencontainers.image.version=$VERSION
+LABEL org.opencontainers.image.vendor="Travelping GmbH"
+LABEL org.opencontainers.image.title="rclone-$VERSION"
+LABEL org.opencontainers.image.description="rclone - rsync for cloud storage"
+
+RUN apk --update --no-cache add \
+        ca-certificates \
+        inotify-tools \
+        lz4 zstd
 COPY --from=builder /usr/bin/rclone /usr/bin/rclone
 
 ENTRYPOINT ["/usr/bin/rclone"]

From b06dc9c472ab44e458083d786d6d8e421b69f186 Mon Sep 17 00:00:00 2001
From: Mathias Gumz <mathias.gumz@travelping.com>
Date: Mon, 27 Jan 2020 19:41:23 +0100
Subject: [PATCH 2/2] Add coreutils to get a proper 'date' implementation

A pure busybox 'date' implementation is not able to parse proper ISO8601
dates. Such a feature might be required in the scripts used in
combination with the 'inotify-tools'. Thus, this commits adds
'coreutils' in order to get a proper 'date' implementation.
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 56c490b..59a8673 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,6 +29,7 @@ LABEL org.opencontainers.image.description="rclone - rsync for cloud storage"
 
 RUN apk --update --no-cache add \
         ca-certificates \
+        coreutils \
         inotify-tools \
         lz4 zstd
 COPY --from=builder /usr/bin/rclone /usr/bin/rclone