Init changed to tini; rclone v1.59.2; directory marker builds

Author: Jancis

CHANGELOG.txt

@@ -0,0 +1,5 @@
+# CHANGELOG
+
+1.3.0: 
+  - Container init changed to tini
+  - rclone plugin version v1.59.2

Dockerfile

@@ -6,10 +6,18 @@ COPY . .
 RUN make plugin
 
 ####
-FROM alpine:3.9
-RUN apk add --no-cache ca-certificates bash fuse curl unzip
+FROM alpine:3.16
+RUN apk add --no-cache ca-certificates bash fuse curl unzip tini
 
 RUN curl https://rclone.org/install.sh | bash
 
+# Use pre-compiled version (with cirectory marker patch)
+# https://github.com/rclone/rclone/pull/5323
+# COPY bin/rclone /usr/bin/rclone
+# RUN chmod 755 /usr/bin/rclone \
+#     && chown root:root /usr/bin/rclone
+
 COPY --from=builder /go/src/csi-rclone-nodeplugin/_output/csi-rclone-plugin /bin/csi-rclone-plugin
-ENTRYPOINT ["/bin/csi-rclone-plugin"]
+
+ENTRYPOINT [ "/sbin/tini", "--"]
+CMD ["/bin/csi-rclone-plugin"]

Dockerfile.dm

@@ -0,0 +1,23 @@
+####
+FROM golang:alpine AS builder
+RUN apk update && apk add --no-cache git make bash
+WORKDIR $GOPATH/src/csi-rclone-nodeplugin
+COPY . .
+RUN make plugin
+
+####
+FROM alpine:3.16
+RUN apk add --no-cache ca-certificates bash fuse curl unzip tini
+
+# RUN curl https://rclone.org/install.sh | bash
+
+# Use pre-compiled version (with cirectory marker patch)
+# https://github.com/rclone/rclone/pull/5323
+COPY bin/rclone /usr/bin/rclone
+RUN chmod 755 /usr/bin/rclone \
+    && chown root:root /usr/bin/rclone
+
+COPY --from=builder /go/src/csi-rclone-nodeplugin/_output/csi-rclone-plugin-dm /bin/csi-rclone-plugin
+
+ENTRYPOINT [ "/sbin/tini", "--"]
+CMD ["/bin/csi-rclone-plugin"]

Makefile

@@ -20,16 +20,28 @@ IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(VERSION)
 .PHONY: all rclone-plugin clean rclone-container
 
 all: plugin container push
+dm: plugin-dm container-dm push-dm
 
 plugin:
 	go mod download
 	CGO_ENABLED=0 GOOS=linux go build -a -gcflags=-trimpath=$(go env GOPATH) -asmflags=-trimpath=$(go env GOPATH) -ldflags '-X github.com/wunderio/csi-rclone/pkg/rclone.DriverVersion=$(VERSION) -extldflags "-static"' -o _output/csi-rclone-plugin ./cmd/csi-rclone-plugin
 
+plugin-dm:
+	go mod download
+	CGO_ENABLED=0 GOOS=linux go build -a -gcflags=-trimpath=$(go env GOPATH) -asmflags=-trimpath=$(go env GOPATH) -ldflags '-X github.com/wunderio/csi-rclone/pkg/rclone.DriverVersion=$(VERSION)-dm -extldflags "-static"' -o _output/csi-rclone-plugin-dm ./cmd/csi-rclone-plugin
+	
 container:
 	docker build -t $(IMAGE_TAG) -f ./cmd/csi-rclone-plugin/Dockerfile .
 
+container-dm:
+	docker build -t $(IMAGE_TAG)-dm -f ./cmd/csi-rclone-plugin/Dockerfile.dm .
+
 push:
 	docker push $(IMAGE_TAG)
+
+push-dm:
+	docker push $(IMAGE_TAG)-dm
+
 clean:
 	go clean -r -x
 	-rm -rf _output

README.md

@@ -91,3 +91,6 @@ make container
 ``` 
 make push
 ```
+## Changelog
+
+See [CHANGELOG.txt](CHANGELOG.txt)

VERSION

@@ -1 +1 @@
-v1.2.9
+v1.3.0

cmd/csi-rclone-plugin/Dockerfile

@@ -1,7 +1,15 @@
-FROM alpine:3.9
-RUN apk add --no-cache ca-certificates bash fuse curl unzip
+FROM alpine:3.16
+RUN apk add --no-cache ca-certificates bash fuse curl unzip tini
 
 RUN curl https://rclone.org/install.sh | bash
 
+# Use pre-compiled version (with cirectory marker patch)
+# https://github.com/rclone/rclone/pull/5323
+# COPY bin/rclone /usr/bin/rclone
+# RUN chmod 755 /usr/bin/rclone \
+#     && chown root:root /usr/bin/rclone
+
 COPY ./_output/csi-rclone-plugin /bin/csi-rclone-plugin
-ENTRYPOINT ["/bin/csi-rclone-plugin"]
+
+ENTRYPOINT [ "/sbin/tini", "--"]
+CMD ["/bin/csi-rclone-plugin"]

cmd/csi-rclone-plugin/Dockerfile.dm

@@ -0,0 +1,15 @@
+FROM alpine:3.16
+RUN apk add --no-cache ca-certificates bash fuse curl unzip tini
+
+# RUN curl https://rclone.org/install.sh | bash
+
+# Use pre-compiled version (with cirectory marker patch)
+# https://github.com/rclone/rclone/pull/5323
+COPY bin/rclone /usr/bin/rclone
+RUN chmod 755 /usr/bin/rclone \
+    && chown root:root /usr/bin/rclone
+
+COPY ./_output/csi-rclone-plugin-dm /bin/csi-rclone-plugin
+
+ENTRYPOINT [ "/sbin/tini", "--"]
+CMD ["/bin/csi-rclone-plugin"]