Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pkg/buildx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# limitations under the License.

ARG XX_VERSION="1.9.0"
ARG DEBIAN_FRONTEND="noninteractive"

ARG DISTRO_NAME="debian12"
ARG DISTRO_TYPE="deb"
Expand Down Expand Up @@ -84,7 +83,6 @@ COPY --from=metadata-builder /out /
# deb
FROM ${DISTRO_IMAGE} AS builder-deb
COPY --from=xx / /
ARG DEBIAN_FRONTEND
ENV GOPROXY="https://proxy.golang.org|direct"
ENV GOPATH="/go"
ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
Expand Down Expand Up @@ -156,7 +154,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
# static
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static
COPY --from=xx / /
ARG DEBIAN_FRONTEND
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git make zip tar
ENV GOPROXY="https://proxy.golang.org|direct"
ENV GOPATH="/go"
Expand Down
3 changes: 0 additions & 3 deletions pkg/cagent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# limitations under the License.

ARG XX_VERSION="1.9.0"
ARG DEBIAN_FRONTEND="noninteractive"

ARG DISTRO_NAME="debian12"
ARG DISTRO_TYPE="deb"
Expand Down Expand Up @@ -89,7 +88,6 @@ COPY --from=metadata-builder /out /
# deb
FROM ${DISTRO_IMAGE} AS builder-deb
COPY --from=xx / /
ARG DEBIAN_FRONTEND
ENV GOPROXY="https://proxy.golang.org|direct"
ENV GOPATH="/go"
ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
Expand Down Expand Up @@ -161,7 +159,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
# static
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static
COPY --from=xx / /
ARG DEBIAN_FRONTEND
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar \
dpkg-dev clang make pkg-config curl
ARG ZIG_VERSION
Expand Down
4 changes: 0 additions & 4 deletions pkg/compose/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# limitations under the License.

ARG XX_VERSION="1.9.0"
ARG DEBIAN_FRONTEND="noninteractive"

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

FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static-darwin
COPY --from=xx / /
ARG DEBIAN_FRONTEND
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar \
dpkg-dev clang lld llvm make pkg-config
ENV GOPROXY="https://proxy.golang.org|direct"
Expand Down
3 changes: 0 additions & 3 deletions pkg/containerd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# limitations under the License.

ARG XX_VERSION="1.9.0"
ARG DEBIAN_FRONTEND="noninteractive"

# https://github.com/containerd/containerd/blob/main/.github/workflows/ci.yml#L111
ARG MD2MAN_VERSION="v2.0.2"
Expand Down Expand Up @@ -167,7 +166,6 @@ COPY --from=metadata-builder /out /
# deb
FROM ${DISTRO_IMAGE} AS builder-deb
COPY --from=xx / /
ARG DEBIAN_FRONTEND
ENV GOPROXY="https://proxy.golang.org|direct"
ENV GOPATH="/go"
ENV GOTOOLCHAIN="local"
Expand Down Expand Up @@ -244,7 +242,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
# static
FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static
COPY --from=xx / /
ARG DEBIAN_FRONTEND
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git gperf zip tar \
dpkg-dev clang make pkg-config
ENV GOPROXY="https://proxy.golang.org|direct"
Expand Down
4 changes: 0 additions & 4 deletions pkg/credential-helpers/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

ARG XX_VERSION="1.9.0"
ARG OSXCROSS_VERSION="11.3-r7-debian"
ARG DEBIAN_FRONTEND="noninteractive"

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

FROM --platform=$BUILDPLATFORM ${DISTRO_IMAGE} AS builder-static-darwin
COPY --from=xx / /
ARG DEBIAN_FRONTEND
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates file git zip tar \
dpkg-dev clang make pkg-config
ENV GOPROXY="https://proxy.golang.org|direct"
Expand Down
5 changes: 0 additions & 5 deletions pkg/docker-cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# limitations under the License.

ARG XX_VERSION="1.9.0"
ARG DEBIAN_FRONTEND="noninteractive"

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

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

FROM build-base-static AS builder-static-darwin
ARG DEBIAN_FRONTEND
RUN apt-get install -y --no-install-recommends dpkg-dev clang lld llvm make pkg-config
ARG PKG_NAME
ARG PKG_REF
Expand Down
4 changes: 0 additions & 4 deletions pkg/docker-engine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# limitations under the License.

ARG XX_VERSION="1.9.0"
ARG DEBIAN_FRONTEND="noninteractive"

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

FROM build-base-static AS builder-static
ARG DEBIAN_FRONTEND
RUN apt-get install -y --no-install-recommends clang cmake gcc libc6-dev lld llvm make pkg-config
ARG PKG_NAME
ARG PKG_REF
Expand Down
3 changes: 0 additions & 3 deletions pkg/model/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# limitations under the License.

ARG XX_VERSION="1.9.0"
ARG DEBIAN_FRONTEND="noninteractive"

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