restic-rest-server: use custom entrypoint

3 files changed, 32 insertions, 8 deletions

diff --git a/restic-rest-server/Dockerfile b/restic-rest-server/Dockerfile
index 2b038a8..e2b5b87 100644
--- a/restic-rest-server/Dockerfile
+++ b/restic-rest-server/Dockerfile
@@ -9,12 +9,13 @@ RUN set -eux; \
 FROM alpine:latest
 LABEL maintainer="Mike Crute <mike@crute.us>"
 
-ENV DATA_DIRECTORY /data
 ENV PASSWORD_FILE /data/.htpasswd
 
-RUN apk add --no-cache --update apache2-utils
+RUN set -eux; \
+        apk add --no-cache \
+            apache2-utils;
 
 COPY --from=builder /tmp/rest-server/rest-server /tmp/rest-server/docker/*_user /usr/bin/
-COPY --from=builder /tmp/rest-server/docker/entrypoint.sh /entrypoint.sh
+ADD entrypoint.sh /entrypoint.sh
 
 CMD [ "/entrypoint.sh" ]
diff --git a/restic-rest-server/Makefile b/restic-rest-server/Makefile
index 5fd0238..8ba21be 100644
--- a/restic-rest-server/Makefile
+++ b/restic-rest-server/Makefile
@@ -1,9 +1,9 @@
 VERSION=0.9.8
-IMAGE=docker.crute.me/restic-rest-server:$(VERSION)
+IMAGE=docker.crute.me/restic-rest-server
 
 all:
         docker pull alpine:latest
-        docker build -t $(IMAGE) .
+        docker build -t $(IMAGE):$(VERSION) .
 
 all-no-cache:
         docker build \
@@ -21,6 +21,6 @@ run:
                 $(IMAGE)
 
 publish:
-        docker push $(IMAGE)
-        docker tag $(IMAGE) $(LATEST)
-        docker push $(LATEST)
+        docker push $(IMAGE):$(VERSION)
+        docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
+        docker push $(IMAGE):latest
diff --git a/restic-rest-server/entrypoint.sh b/restic-rest-server/entrypoint.sh
new file mode 100755
index 0000000..57a9afb
--- /dev/null
+++ b/restic-rest-server/entrypoint.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+DATA_DIRECTORY=${DATA_DIRECTORY:-"/data"}
+PASSWORD_FILE=${PASSWORD_FILE:-"/data/.htpasswd"}
+DISABLE_AUTHENTICATION=${DISABLE_AUTHENTICATION:-"true"}
+OPTIONS=${OPTIONS:-"--append-only --prometheus"}
+
+if [ "$DISABLE_AUTHENTICATION" = "false" ]; then
+    [ ! -f "$PASSWORD_FILE" ] && touch "$PASSWORD_FILE"
+
+    if [ ! -s "$PASSWORD_FILE" ]; then
+        echo
+        echo "**WARNING** No user exists, please 'docker exec -it \$CONTAINER_ID create_user'"
+        echo
+    fi
+else
+    rm -f "$PASSWORD_FILE"
+    OPTIONS="$OPTIONS --no-auth"
+fi
+
+exec rest-server --path "$DATA_DIRECTORY" $OPTIONS