update

oci/fluxcd/flux-helm-flux-image-automation-controller/Dockerfile

@@ -1,90 +0,0 @@
-ARG BASE_VARIANT=alpine
-ARG GO_VERSION=1.18
-ARG XX_VERSION=1.1.2
-
-ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2-only
-ARG LIBGIT2_TAG=v0.2.0
-
-FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} AS libgit2-libs
-
-FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
-
-FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
-
-FROM gostable AS go-linux
-
-# Build-base consists of build platform dependencies and xx.
-# These will be used at current arch to yield execute the cross compilations.
-FROM go-${TARGETOS} AS build-base
-
-RUN apk add clang lld pkgconfig
-
-COPY --from=xx / /
-
-# build-go-mod can still be cached at build platform architecture.
-FROM build-base as build-go-mod
-
-# Configure workspace
-WORKDIR /workspace
-
-# Copy api submodule
-COPY api/ api/
-
-# Copy modules manifests
-COPY go.mod go.mod
-COPY go.sum go.sum
-
-# Cache modules
-RUN go mod download
-
-# Build stage install per target platform
-# dependency and effectively cross compile the application.
-FROM build-go-mod as build
-
-ARG TARGETPLATFORM
-
-COPY --from=libgit2-libs /usr/local/ /usr/local/
-
-# Some dependencies have to installed
-# for the target platform: https://github.com/tonistiigi/xx#go--cgo
-RUN xx-apk add musl-dev gcc clang lld
-
-WORKDIR /workspace
-
-# Copy source code
-COPY main.go main.go
-COPY controllers/ controllers/
-COPY pkg/ pkg/
-COPY internal/ internal/
-
-ARG TARGETPLATFORM
-ARG TARGETARCH
-ENV CGO_ENABLED=1
-
-RUN export LIBRARY_PATH="/usr/local/$(xx-info triple)" && \
-    export PKG_CONFIG_PATH="/usr/local/$(xx-info triple)/lib/pkgconfig" && \
-    export CGO_LDFLAGS="$(pkg-config --static --libs --cflags libgit2) -static -fuse-ld=lld" && \
-    xx-go build  \
-        -ldflags "-s -w" \
-        -tags 'netgo,osusergo,static_build' \
-        -o /image-automation-controller -trimpath main.go;
-
-# Ensure that the binary was cross-compiled correctly to the target platform.
-RUN xx-verify --static /image-automation-controller
-
-FROM artifact.onwalk.net/public/alpine-ca:latest
-
-ARG TARGETPLATFORM
-RUN apk --no-cache add ca-certificates \
-  && update-ca-certificates
-
-# Create minimal nsswitch.conf file to prioritize the usage of /etc/hosts over DNS queries.
-# https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-354316460
-RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
-
-# Copy over binary from build
-COPY --from=build /image-automation-controller /usr/local/bin/
-COPY ATTRIBUTIONS.md /
-
-USER 65534:65534
-ENTRYPOINT [ "image-automation-controller" ]

oci/fluxcd/flux-image-automation-controller/Dockerfile

@@ -1,8 +1,6 @@
 FROM ghcr.io/fluxcd/image-automation-controller:v0.23.4 as build
 
 FROM artifact.onwalk.net/public/alpine-ca:latest as prod
-ARG TARGETPLATFORM
-RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
 COPY --from=build /usr/local/bin/image-automation-controller /usr/local/bin/
 
 USER 65534:65534