From 81a38cac7581f8a08ee6562a7feea15548997752 Mon Sep 17 00:00:00 2001 From: Jeromy Streets Date: Wed, 5 Feb 2020 10:25:39 -0800 Subject: [PATCH 1/2] Added setcap that requires DOCKER_BUILDKIT to build properly. --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba570f1..cd13cce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ RUN go test -cover ./... RUN CGO_ENABLED=0 go build -a -tags netgo -installsuffix netgo -ldflags "-X github.com/halverneus/static-file-server/cli/version.version=${VERSION}" -o /serve /build/bin/serve RUN adduser --system --no-create-home --uid 1000 --shell /usr/sbin/nologin static +RUN setcap cap_net_bind_service=+ep /serve ################################################################################ ## DEPLOYMENT CONTAINER @@ -33,8 +34,8 @@ CMD [] # Metadata LABEL life.apets.vendor="Halverneus" \ - life.apets.url="https://github.com/halverneus/static-file-server" \ - life.apets.name="Static File Server" \ - life.apets.description="A tiny static file server" \ - life.apets.version="v1.7.1" \ - life.apets.schema-version="1.0" + life.apets.url="https://github.com/halverneus/static-file-server" \ + life.apets.name="Static File Server" \ + life.apets.description="A tiny static file server" \ + life.apets.version="v1.7.1" \ + life.apets.schema-version="1.0" From c076674390667f27bd2f042c5e0f47d7496e4502 Mon Sep 17 00:00:00 2001 From: Jeromy Streets Date: Thu, 6 Feb 2020 09:45:56 -0800 Subject: [PATCH 2/2] Updated Go compiler and spun a new version. --- Dockerfile | 6 +++--- Dockerfile.all | 6 +++--- README.md | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd13cce..28e66b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ ################################################################################ ## GO BUILDER ################################################################################ -FROM golang:1.13.6 as builder +FROM golang:1.13.7 as builder -ENV VERSION 1.7.1 +ENV VERSION 1.7.2 ENV BUILD_DIR /build RUN mkdir -p ${BUILD_DIR} @@ -37,5 +37,5 @@ LABEL life.apets.vendor="Halverneus" \ life.apets.url="https://github.com/halverneus/static-file-server" \ life.apets.name="Static File Server" \ life.apets.description="A tiny static file server" \ - life.apets.version="v1.7.1" \ + life.apets.version="v1.7.2" \ life.apets.schema-version="1.0" diff --git a/Dockerfile.all b/Dockerfile.all index 352b3d4..5058041 100644 --- a/Dockerfile.all +++ b/Dockerfile.all @@ -1,6 +1,6 @@ -FROM golang:1.13.6 as builder +FROM golang:1.13.7 as builder -ENV VERSION 1.7.1 +ENV VERSION 1.7.2 ENV BUILD_DIR /build RUN mkdir -p ${BUILD_DIR} @@ -21,5 +21,5 @@ LABEL life.apets.vendor="Halverneus" \ life.apets.url="https://github.com/halverneus/static-file-server" \ life.apets.name="Static File Server" \ life.apets.description="A tiny static file server" \ - life.apets.version="v1.7.1" \ + life.apets.version="v1.7.2" \ life.apets.schema-version="1.0" diff --git a/README.md b/README.md index 86da89e..d77b07a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # static-file-server ## Introduction + Tiny, simple static file server using environment variables for configuration. Install from any of the following locations: