From 32ad9bef67e721e6359f1cfd8afee13731676fd2 Mon Sep 17 00:00:00 2001 From: Jeshua Lin Date: Wed, 18 Sep 2019 08:37:43 -0400 Subject: [PATCH 1/5] added su-exec and env variables to download.Dockerfile --- docker/download.Dockerfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/download.Dockerfile b/docker/download.Dockerfile index 62c66c7..84f4cbe 100644 --- a/docker/download.Dockerfile +++ b/docker/download.Dockerfile @@ -1,5 +1,10 @@ FROM alpine -EXPOSE 8001 -RUN wget https://github.com/pldubouilh/gossa/releases/download/v0.0.7/gossa-linux64 && mv gossa-linux64 /gossa && chmod +x /gossa -ENTRYPOINT [ "/gossa", "-h", "0.0.0.0", "/shared" ] +ENV UID="1000" GID="1000" HOST="0.0.0.0" PORT="8001" PREFIX="/" FOLLOW_SYMLINKS="false" SKIP_HIDDEN_FILES="true" DATADIR="/shared" +EXPOSE 8001 + +RUN apk add --no-cache su-exec +RUN wget https://github.com/pldubouilh/gossa/releases/download/v0.0.7/gossa-linux64 && mv gossa-linux64 /gossa && chmod +x /gossa + +RUN echo -e 'exec su-exec ${UID}:${GID} /gossa -h ${HOST} -p ${PORT} -k=${SKIP_HIDDEN_FILES} --symlinks=${FOLLOW_SYMLINKS} --prefix=${PREFIX} ${DATADIR}'>> /start.sh +ENTRYPOINT [ "sh", "/start.sh" ] From 9e44366093233e9b06bc374d86a5fbc6a3ec7f21 Mon Sep 17 00:00:00 2001 From: Jeshua Lin Date: Wed, 18 Sep 2019 08:39:24 -0400 Subject: [PATCH 2/5] bump download.Dockerfile to latest release --- docker/download.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/download.Dockerfile b/docker/download.Dockerfile index 84f4cbe..cd3d17c 100644 --- a/docker/download.Dockerfile +++ b/docker/download.Dockerfile @@ -4,7 +4,7 @@ ENV UID="1000" GID="1000" HOST="0.0.0.0" PORT="8001" PREFIX="/" FOLLOW_SYMLINKS= EXPOSE 8001 RUN apk add --no-cache su-exec -RUN wget https://github.com/pldubouilh/gossa/releases/download/v0.0.7/gossa-linux64 && mv gossa-linux64 /gossa && chmod +x /gossa +RUN wget https://github.com/pldubouilh/gossa/releases/download/v0.0.8/gossa-linux64 && mv gossa-linux64 /gossa && chmod +x /gossa RUN echo -e 'exec su-exec ${UID}:${GID} /gossa -h ${HOST} -p ${PORT} -k=${SKIP_HIDDEN_FILES} --symlinks=${FOLLOW_SYMLINKS} --prefix=${PREFIX} ${DATADIR}'>> /start.sh ENTRYPOINT [ "sh", "/start.sh" ] From e4d04ae82cc8ccee647578b76fbc52dc6a1f961a Mon Sep 17 00:00:00 2001 From: Jeshua Lin Date: Wed, 18 Sep 2019 08:43:27 -0400 Subject: [PATCH 3/5] added su-exec and env variables to build.Dockerfile --- docker/build.Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile index dc1f21c..de6f990 100644 --- a/docker/build.Dockerfile +++ b/docker/build.Dockerfile @@ -3,6 +3,9 @@ COPY . /gossaSrc RUN cd /gossaSrc && make FROM alpine +ENV UID="1000" GID="1000" HOST="0.0.0.0" PORT="8001" PREFIX="/" FOLLOW_SYMLINKS="false" SKIP_HIDDEN_FILES="true" DATADIR="/shared" EXPOSE 8001 +RUN apk add --no-cache su-exec COPY --from=builder /gossaSrc/gossa /gossa -ENTRYPOINT [ "/gossa", "-h", "0.0.0.0", "/shared" ] +RUN echo -e 'exec su-exec ${UID}:${GID} /gossa -h ${HOST} -p ${PORT} -k=${SKIP_HIDDEN_FILES} --symlinks=${FOLLOW_SYMLINKS} --prefix=${PREFIX} ${DATADIR}'>> /start.sh +ENTRYPOINT [ "sh", "/start.sh" ] From eb9ba8c099c4b9afc615402e57b1fc2cb42a5b5d Mon Sep 17 00:00:00 2001 From: Jeshua Lin Date: Wed, 18 Sep 2019 09:43:30 -0400 Subject: [PATCH 4/5] respond with http status 500 upon error --- src/gossa.go | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gossa.go b/src/gossa.go index 4fceb93..db78c8f 100755 --- a/src/gossa.go +++ b/src/gossa.go @@ -57,6 +57,7 @@ func check(e error) { func exitPath(w http.ResponseWriter, s ...interface{}) { if r := recover(); r != nil { log.Println("error", s, r) + w.WriteHeader(500) w.Write([]byte("error")) } else if *verb { log.Println(s...) From 8ef4cf60dce65837b0ff2fbf38cabba58b09c80f Mon Sep 17 00:00:00 2001 From: Pierre Dubouilh Date: Sun, 29 Sep 2019 20:10:10 +0000 Subject: [PATCH 5/5] try make CI work on pr --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index c2e7f24..cbd7d15 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,5 +1,5 @@ name: Go -on: [push] +on: [push, pull_request] jobs: build: