From 648bd0b57d11f35650eadbcaed1f18217a8325ef Mon Sep 17 00:00:00 2001 From: "D. Paolella" Date: Tue, 3 Feb 2026 16:33:03 +0100 Subject: [PATCH] Remove unused ART Dockerfiles --- Dockerfile.art | 26 ------------ Dockerfile.installer.art | 87 ---------------------------------------- 2 files changed, 113 deletions(-) delete mode 100644 Dockerfile.art delete mode 100644 Dockerfile.installer.art diff --git a/Dockerfile.art b/Dockerfile.art deleted file mode 100644 index df402664b0cc..000000000000 --- a/Dockerfile.art +++ /dev/null @@ -1,26 +0,0 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder - -COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR -WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app -RUN ls -lR $REMOTE_SOURCES_DIR -RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env -RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env && GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh - -RUN mkdir -p /go/src/go.etcd.io/ -RUN ln -s $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app /go/src/go.etcd.io/etcd - -# stage 2 (note: any changes should reflect in Dockerfile.rhel) -FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 - -ENTRYPOINT ["/usr/bin/etcd"] - -RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/* - -COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcd /usr/bin/ -COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdctl /usr/bin/ -COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdutl /usr/bin/ -COPY --from=builder /go/src/go.etcd.io/etcd/bin/discover-etcd-initial-cluster /usr/bin/ - -LABEL io.k8s.display-name="etcd server" \ - io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \ - maintainer="Sam Batschelet " diff --git a/Dockerfile.installer.art b/Dockerfile.installer.art deleted file mode 100644 index 8e3d0a3bd2c9..000000000000 --- a/Dockerfile.installer.art +++ /dev/null @@ -1,87 +0,0 @@ -# This Dockerfile builds an image containing Mac and Linux ARM64/AMD64 versions of the etcd. -# The resulting image is used to build the statically-linked openshift-installer binary. - -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS macbuilder - -ENV GO_COMPLIANCE_EXCLUDE=".*" -COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR -WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app -RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env -RUN mkdir -p /go/src/go.etcd.io/ -RUN ln -s $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app /go/src/go.etcd.io/etcd -WORKDIR /go/src/go.etcd.io/etcd -COPY . . -RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \ - && export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ - && CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 ./build.sh - -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS macarmbuilder - -ENV GO_COMPLIANCE_EXCLUDE=".*" -COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR -WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app -RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env -RUN mkdir -p /go/src/go.etcd.io/ -RUN ln -s $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app /go/src/go.etcd.io/etcd -WORKDIR /go/src/go.etcd.io/etcd -COPY . . -RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \ - && export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ - && CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 ./build.sh - -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS linuxbuilder - -ENV GO_COMPLIANCE_EXCLUDE=".*" -COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR -WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app -RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env -RUN mkdir -p /go/src/go.etcd.io/ -RUN ln -s $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app /go/src/go.etcd.io/etcd -WORKDIR /go/src/go.etcd.io/etcd -COPY . . -RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \ - && export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ - && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ./build.sh - -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS linuxarmbuilder - -ENV GO_COMPLIANCE_EXCLUDE=".*" -COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR -WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app -RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env -RUN mkdir -p /go/src/go.etcd.io/ -RUN ln -s $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app /go/src/go.etcd.io/etcd -WORKDIR /go/src/go.etcd.io/etcd -COPY . . -RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \ - && export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ - && CGO_ENABLED=0 GOOS=linux GOARCH=arm64 ./build.sh - -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder -ENV GO_COMPLIANCE_EXCLUDE=".*" -COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR -WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app -RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env -RUN mkdir -p /go/src/go.etcd.io/ -RUN ln -s $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app /go/src/go.etcd.io/etcd -WORKDIR /go/src/go.etcd.io/etcd -COPY . . -RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \ - && export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ - && CGO_ENABLED=0 ./build.sh -RUN mkdir -p /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH) && \ - mv bin/etcd /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH)/ - -# stage 2 -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 - -RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/* - -COPY --from=macbuilder /go/src/go.etcd.io/etcd/bin/etcd /usr/share/openshift/darwin/amd64/etcd -COPY --from=macarmbuilder /go/src/go.etcd.io/etcd/bin/etcd /usr/share/openshift/darwin/arm64/etcd -COPY --from=linuxbuilder /go/src/go.etcd.io/etcd/bin/etcd /usr/share/openshift/linux/amd64/etcd -COPY --from=linuxarmbuilder /go/src/go.etcd.io/etcd/bin/etcd /usr/share/openshift/linux/arm64/etcd -COPY --from=builder /usr/share/openshift/ /usr/share/openshift/ - -# This image is not an operator, it is only used as part of the build pipeline -LABEL io.openshift.release.operator=false