From 276a001c2abb107a3cac7fb9b26ef95176312ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Bjug=C3=A5rd?= <287697+abjugard@users.noreply.github.com> Date: Tue, 17 Jan 2023 13:30:13 +0100 Subject: [PATCH] Install `libcap` in builder image to make it easier for users building their own images to do it securely Mitigates #104 --- 2.6/builder/Dockerfile | 7 ++++--- Dockerfile.builder.tmpl | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/2.6/builder/Dockerfile b/2.6/builder/Dockerfile index 7c7c9ef..eb59fec 100644 --- 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 + git \ + ca-certificates \ + 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 \ No newline at end of file diff --git a/Dockerfile.builder.tmpl b/Dockerfile.builder.tmpl index 9e94b1e..f52d5a9 100644 --- a/Dockerfile.builder.tmpl +++ b/Dockerfile.builder.tmpl @@ -1,8 +1,9 @@ {{ .base | strings.TrimSpace }} RUN apk add --no-cache \ - git \ - ca-certificates + git \ + ca-certificates \ + 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 \ No newline at end of file