Install libcap in builder image to make it easier for users buildin…

…g their own images to do it securely Mitigates caddyserver#104
abjugard · Jan 21, 2023 · 9c04c2b · 9c04c2b
1 parent 159cb29
commit 9c04c2b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/2.6/builder/Dockerfile b/2.6/builder/Dockerfile
@@ -1,8 +1,9 @@
 FROM golang:1.19-alpine
 
 RUN apk add --no-cache \
-    git \
-    ca-certificates
+	ca-certificates \
+	git \
+	libcap
 
 ENV XCADDY_VERSION v0.3.1
 # Configures xcaddy to build with this version of Caddy
@@ -29,4 +30,4 @@ RUN set -eux; \
 
 COPY caddy-builder.sh /usr/bin/caddy-builder
 
-WORKDIR /usr/bin
+WORKDIR /usr/bin
diff --git a/Dockerfile.builder.tmpl b/Dockerfile.builder.tmpl
@@ -1,8 +1,9 @@
 {{ .base | strings.TrimSpace }}
 
 RUN apk add --no-cache \
-    git \
-    ca-certificates
+	ca-certificates \
+	git \
+	libcap
 
 ENV XCADDY_VERSION v{{ .xcaddy_config.version }}
 # Configures xcaddy to build with this version of Caddy
@@ -29,4 +30,4 @@ RUN set -eux; \
 
 COPY caddy-builder.sh /usr/bin/caddy-builder
 
-WORKDIR /usr/bin
+WORKDIR /usr/bin