Fix Docker configuration for authentication

This commit is contained in:
Lewis Juggins
2020-10-06 18:54:29 +01:00
committed by Michael Eischer
parent a44c025cd3
commit cec241e5e1
3 changed files with 13 additions and 3 deletions

View File

@@ -11,8 +11,10 @@ RUN go build -o rest-server ./cmd/rest-server
FROM alpine FROM alpine
ENV DATA_DIRECTORY /data ENV DATA_DIRECTORY="/data"
ENV PASSWORD_FILE /data/.htpasswd ENV PASSWORD_FILE="/data/.htpasswd"
ENV DISABLE_AUTHENTICATION=""
ENV OPTIONS=""
RUN apk add --no-cache --update apache2-utils RUN apk add --no-cache --update apache2-utils

View File

@@ -0,0 +1,6 @@
Security: Fix Docker configuration for DISABLE_AUTHENTICATION
A regression was introduced which caused the DISABLE_AUTHENTICATION environment variable to stop working in Docker configurations, this was due to a new flag being introduced to disable authentication --no-auth.
https://github.com/restic/rest-server/issues/119
https://github.com/restic/rest-server/pull/124

View File

@@ -2,7 +2,9 @@
set -e set -e
if [ -z "$DISABLE_AUTHENTICATION" ]; then if [ -n "$DISABLE_AUTHENTICATION" ]; then
OPTIONS="--no-auth $OPTIONS"
else
if [ ! -f "$PASSWORD_FILE" ]; then if [ ! -f "$PASSWORD_FILE" ]; then
touch "$PASSWORD_FILE" touch "$PASSWORD_FILE"
fi fi