Skip to content

Commit 88d12f7

Browse files
thaJeztahthaJeztah
committed
pkg/*: remove redundant DEBIAN_FRONTEND=noninteractive
This should no longer be needed for current versions of Debian and Ubuntu. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 8eb4c06 commit 88d12f7

File tree

8 files changed

+0
-29
lines changed

8 files changed

+0
-29
lines changed

‎pkg/buildx/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# limitations under the License.
1616

1717
ARG XX_VERSION="1.9.0"
18-
ARG DEBIAN_FRONTEND="noninteractive"
1918

2019
ARG DISTRO_NAME="debian12"
2120
ARG DISTRO_TYPE="deb"
@@ -84,7 +83,6 @@ COPY --from=metadata-builder /out /
8483
# deb
8584
FROM ${DISTRO_IMAGE} AS builder-deb
8685
COPY --from=xx / /
87-
ARG DEBIAN_FRONTEND
8886
ENV GOPROXY="https://proxy.golang.org|direct"
8987
ENV GOPATH="/go"
9088
ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
@@ -156,7 +154,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
156154
# static
157155
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static
158156
COPY --from=xx / /
159-
ARG DEBIAN_FRONTEND
160157
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git make zip tar
161158
ENV GOPROXY="https://proxy.golang.org|direct"
162159
ENV GOPATH="/go"

‎pkg/cagent/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# limitations under the License.
1616

1717
ARG XX_VERSION="1.9.0"
18-
ARG DEBIAN_FRONTEND="noninteractive"
1918

2019
ARG DISTRO_NAME="debian12"
2120
ARG DISTRO_TYPE="deb"
@@ -89,7 +88,6 @@ COPY --from=metadata-builder /out /
8988
# deb
9089
FROM ${DISTRO_IMAGE} AS builder-deb
9190
COPY --from=xx / /
92-
ARG DEBIAN_FRONTEND
9391
ENV GOPROXY="https://proxy.golang.org|direct"
9492
ENV GOPATH="/go"
9593
ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
@@ -161,7 +159,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
161159
# static
162160
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static
163161
COPY --from=xx / /
164-
ARG DEBIAN_FRONTEND
165162
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar \
166163
dpkg-dev clang make pkg-config curl
167164
ARG ZIG_VERSION

‎pkg/compose/Dockerfile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# limitations under the License.
1616

1717
ARG XX_VERSION="1.9.0"
18-
ARG DEBIAN_FRONTEND="noninteractive"
1918

2019
ARG DISTRO_NAME="debian12"
2120
ARG DISTRO_TYPE="deb"
@@ -87,7 +86,6 @@ COPY --from=metadata-builder /out /
8786
# deb
8887
FROM ${DISTRO_IMAGE} AS builder-deb
8988
COPY --from=xx / /
90-
ARG DEBIAN_FRONTEND
9189
ENV GOPROXY="https://proxy.golang.org|direct"
9290
ENV GOPATH="/go"
9391
ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
@@ -159,7 +157,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
159157
# static
160158
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static-nosdk
161159
COPY --from=xx / /
162-
ARG DEBIAN_FRONTEND
163160
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar \
164161
dpkg-dev clang lld llvm make pkg-config
165162
ENV GOPROXY="https://proxy.golang.org|direct"
@@ -191,7 +188,6 @@ FROM builder-static-nosdk AS builder-static-windows
191188

192189
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static-darwin
193190
COPY --from=xx / /
194-
ARG DEBIAN_FRONTEND
195191
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar \
196192
dpkg-dev clang lld llvm make pkg-config
197193
ENV GOPROXY="https://proxy.golang.org|direct"

‎pkg/containerd/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# limitations under the License.
1616

1717
ARG XX_VERSION="1.9.0"
18-
ARG DEBIAN_FRONTEND="noninteractive"
1918

2019
# https://github.com/containerd/containerd/blob/main/.github/workflows/ci.yml#L111
2120
ARG MD2MAN_VERSION="v2.0.2"
@@ -167,7 +166,6 @@ COPY --from=metadata-builder /out /
167166
# deb
168167
FROM ${DISTRO_IMAGE} AS builder-deb
169168
COPY --from=xx / /
170-
ARG DEBIAN_FRONTEND
171169
ENV GOPROXY="https://proxy.golang.org|direct"
172170
ENV GOPATH="/go"
173171
ENV GOTOOLCHAIN="local"
@@ -244,7 +242,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
244242
# static
245243
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static
246244
COPY --from=xx / /
247-
ARG DEBIAN_FRONTEND
248245
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git gperf zip tar \
249246
dpkg-dev clang make pkg-config
250247
ENV GOPROXY="https://proxy.golang.org|direct"

‎pkg/credential-helpers/Dockerfile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
ARG XX_VERSION="1.9.0"
1818
ARG OSXCROSS_VERSION="11.3-r7-debian"
19-
ARG DEBIAN_FRONTEND="noninteractive"
2019

2120
ARG DISTRO_NAME="debian12"
2221
ARG DISTRO_TYPE="deb"
@@ -88,7 +87,6 @@ COPY --from=metadata-builder /out /
8887
# deb
8988
FROM ${DISTRO_IMAGE} AS builder-deb
9089
COPY --from=xx / /
91-
ARG DEBIAN_FRONTEND
9290
ENV GOPROXY="https://proxy.golang.org|direct"
9391
ENV GOPATH="/go"
9492
ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
@@ -158,7 +156,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
158156
# static
159157
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static-nosdk
160158
COPY --from=xx / /
161-
ARG DEBIAN_FRONTEND
162159
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar \
163160
dpkg-dev clang make pkg-config
164161
ENV GOPROXY="https://proxy.golang.org|direct"
@@ -184,7 +181,6 @@ FROM builder-static-nosdk AS builder-static-windows
184181

185182
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static-darwin
186183
COPY --from=xx / /
187-
ARG DEBIAN_FRONTEND
188184
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar \
189185
dpkg-dev clang make pkg-config
190186
ENV GOPROXY="https://proxy.golang.org|direct"

‎pkg/docker-cli/Dockerfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# limitations under the License.
1616

1717
ARG XX_VERSION="1.9.0"
18-
ARG DEBIAN_FRONTEND="noninteractive"
1918

2019
# https://github.com/docker/cli/blob/master/Dockerfile#L9
2120
ARG GOVERSIONINFO_VERSION="v1.4.1"
@@ -90,7 +89,6 @@ COPY --from=metadata-builder /out /
9089
# deb
9190
FROM ${DISTRO_IMAGE} AS builder-deb
9291
COPY --from=xx / /
93-
ARG DEBIAN_FRONTEND
9492
ENV GOPROXY="https://proxy.golang.org|direct"
9593
ENV GOPATH="/go"
9694
ENV GOTOOLCHAIN="local"
@@ -171,7 +169,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
171169
# static
172170
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS build-base-static
173171
COPY --from=xx / /
174-
ARG DEBIAN_FRONTEND
175172
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar
176173
ENV GOPROXY="https://proxy.golang.org|direct"
177174
ENV GOPATH="/go"
@@ -186,7 +183,6 @@ RUN --mount=type=bind,from=gocross,source=/usr/local/go,target=/usr/local/go,rw
186183
GOBIN=/out GO111MODULE=on go install "github.com/josephspurrier/goversioninfo/cmd/goversioninfo@${GOVERSIONINFO_VERSION}"
187184

188185
FROM build-base-static AS builder-static-nosdk
189-
ARG DEBIAN_FRONTEND
190186
RUN apt-get install -y --no-install-recommends dpkg-dev clang lld llvm make pkg-config
191187
ARG PKG_NAME
192188
ARG PKG_REF
@@ -206,7 +202,6 @@ FROM builder-static-nosdk AS builder-static-linux
206202
FROM builder-static-nosdk AS builder-static-windows
207203

208204
FROM build-base-static AS builder-static-darwin
209-
ARG DEBIAN_FRONTEND
210205
RUN apt-get install -y --no-install-recommends dpkg-dev clang lld llvm make pkg-config
211206
ARG PKG_NAME
212207
ARG PKG_REF

‎pkg/docker-engine/Dockerfile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# limitations under the License.
1616

1717
ARG XX_VERSION="1.9.0"
18-
ARG DEBIAN_FRONTEND="noninteractive"
1918

2019
# https://github.com/moby/moby/blob/master/Dockerfile#L157
2120
ARG GOWINRES_VERSION="v0.3.1"
@@ -87,7 +86,6 @@ COPY --from=metadata-builder /out /
8786
# deb
8887
FROM ${DISTRO_IMAGE} AS builder-deb
8988
COPY --from=xx / /
90-
ARG DEBIAN_FRONTEND
9189
ENV GOPROXY="https://proxy.golang.org|direct"
9290
ENV GOPATH="/go"
9391
ENV GOTOOLCHAIN="local"
@@ -180,7 +178,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
180178
# static
181179
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS build-base-static
182180
COPY --from=xx / /
183-
ARG DEBIAN_FRONTEND
184181
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar
185182
ENV GOPROXY="https://proxy.golang.org|direct"
186183
ENV GOPATH="/go"
@@ -194,7 +191,6 @@ RUN --mount=type=bind,from=gocross,source=/usr/local/go,target=/usr/local/go,rw
194191
GOBIN=/out GO111MODULE=on go install "github.com/tc-hib/go-winres@${GOWINRES_VERSION}"
195192

196193
FROM build-base-static AS builder-static
197-
ARG DEBIAN_FRONTEND
198194
RUN apt-get install -y --no-install-recommends clang cmake gcc libc6-dev lld llvm make pkg-config
199195
ARG PKG_NAME
200196
ARG PKG_REF

‎pkg/model/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# limitations under the License.
1616

1717
ARG XX_VERSION="1.9.0"
18-
ARG DEBIAN_FRONTEND="noninteractive"
1918

2019
ARG DISTRO_NAME="debian12"
2120
ARG DISTRO_TYPE="deb"
@@ -87,7 +86,6 @@ COPY --from=metadata-builder /out /
8786
# deb
8887
FROM ${DISTRO_IMAGE} AS builder-deb
8988
COPY --from=xx / /
90-
ARG DEBIAN_FRONTEND
9189
ENV GOPROXY="https://proxy.golang.org|direct"
9290
ENV GOPATH="/go"
9391
ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
@@ -159,7 +157,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
159157
# static
160158
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static
161159
COPY --from=xx / /
162-
ARG DEBIAN_FRONTEND
163160
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar
164161
ENV GOPROXY="https://proxy.golang.org|direct"
165162
ENV GOPATH="/go"

0 commit comments

Comments
 (0)