Merge pull request #45 from halverneus/dev

Re-allow use of privileged ports
This commit is contained in:
Jeromy Streets 2020-02-06 09:58:13 -08:00 committed by GitHub
commit 2285532442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions

View File

@ -1,9 +1,9 @@
################################################################################ ################################################################################
## GO BUILDER ## 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 ENV BUILD_DIR /build
RUN mkdir -p ${BUILD_DIR} RUN mkdir -p ${BUILD_DIR}
@ -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 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 adduser --system --no-create-home --uid 1000 --shell /usr/sbin/nologin static
RUN setcap cap_net_bind_service=+ep /serve
################################################################################ ################################################################################
## DEPLOYMENT CONTAINER ## DEPLOYMENT CONTAINER
@ -33,8 +34,8 @@ CMD []
# Metadata # Metadata
LABEL life.apets.vendor="Halverneus" \ LABEL life.apets.vendor="Halverneus" \
life.apets.url="https://github.com/halverneus/static-file-server" \ life.apets.url="https://github.com/halverneus/static-file-server" \
life.apets.name="Static File Server" \ life.apets.name="Static File Server" \
life.apets.description="A tiny 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" life.apets.schema-version="1.0"

View File

@ -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 ENV BUILD_DIR /build
RUN mkdir -p ${BUILD_DIR} 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.url="https://github.com/halverneus/static-file-server" \
life.apets.name="Static File Server" \ life.apets.name="Static File Server" \
life.apets.description="A tiny 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" life.apets.schema-version="1.0"

View File

@ -1,6 +1,7 @@
# static-file-server # static-file-server
## Introduction ## Introduction
Tiny, simple static file server using environment variables for configuration. Tiny, simple static file server using environment variables for configuration.
Install from any of the following locations: Install from any of the following locations: