@@ -19,9 +19,8 @@ USER root
19
19
# the build process assumes go is under "/go", so let's make sure it works
20
20
RUN ln -s /opt/app-root/src/go /go
21
21
RUN go install github.com/mikefarah/yq/v4@$YQ_VERSION
22
-
23
22
# This registering RHEL when building on an unsubscribed system
24
- # If you are running a UBI container on a registered and subscribed RHEL host,
23
+ # If you are running a UBI container on a registered and subscribed RHEL host,
25
24
# the main RHEL Server repository is enabled inside the standard UBI container.
26
25
RUN if command -v subscription-manager; then \
27
26
REPO_ARCH=$(uname -m) && \
@@ -63,19 +62,19 @@ ENV BUILTIN_CLOUD_PROVIDERS="strictfipsruntime aws azure ibmcloud vsphere libvir
63
62
ENV PATH=/opt/app-root/src/go/bin:$PATH
64
63
RUN CC=gcc make ARCH=$TARGETARCH COMMIT=$COMMIT VERSION=$VERSION RELEASE_BUILD=$RELEASE_BUILD cloud-api-adaptor
65
64
66
- FROM builder-release AS iptables
67
-
65
+ # FROM builder-release AS iptables
66
+ #
68
67
#ARG TARGETARCH
69
-
70
- WORKDIR /iptables
71
- ENV PATH=/opt/app-root/src/go/bin:$PATH
72
- RUN --mount=type=bind,target=/versions.yaml,source=cloud-api-adaptor/versions.yaml,readonly \
73
- version=$(yq -r .tools.iptables-wrapper /versions.yaml) && \
74
- GOARCH=$TARGETARCH go install "github.com/kubernetes-sigs/iptables-wrappers@$version" && \
75
- shopt -s globstar && \
76
- cp /go/bin/**/iptables-wrappers ./iptables-wrapper && \
77
- curl -L -o iptables-wrapper-installer.sh "https://raw.githubusercontent.com/kubernetes-sigs/iptables-wrappers/${version#v*-*-}/iptables-wrapper-installer.sh" && \
78
- chmod 755 iptables-wrapper-installer.sh
68
+ #
69
+ # WORKDIR /iptables
70
+ # ENV PATH=/opt/app-root/src/go/bin:$PATH
71
+ # RUN --mount=type=bind,target=/versions.yaml,source=cloud-api-adaptor/versions.yaml,readonly \
72
+ # version=$(yq -r .tools.iptables-wrapper /versions.yaml) && \
73
+ # GOARCH=$TARGETARCH go install "github.com/kubernetes-sigs/iptables-wrappers@$version" && \
74
+ # shopt -s globstar && \
75
+ # cp /go/bin/**/iptables-wrappers ./iptables-wrapper && \
76
+ # curl -L -o iptables-wrapper-installer.sh "https://raw.githubusercontent.com/kubernetes-sigs/iptables-wrappers/${version#v*-*-}/iptables-wrapper-installer.sh" && \
77
+ # chmod 755 iptables-wrapper-installer.sh
79
78
80
79
FROM registry.access.redhat.com/ubi9/ubi:9.5 AS base-release
81
80
USER root
@@ -87,10 +86,9 @@ RUN if command -v subscription-manager; then \
87
86
dnf -y install 'dnf-command(config-manager)' && dnf config-manager --enable crb; \
88
87
fi
89
88
90
- RUN dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -y
91
- RUN dnf install -y iptables iptables-legacy iptables-nft nftables && dnf clean all
92
- RUN --mount=type=cache,target=/iptables,from=iptables,source=/iptables,readonly \
93
- cd /iptables && ./iptables-wrapper-installer.sh --no-sanity-check --no-cleanup
89
+ RUN dnf install -y iptables iptables-nft nftables && dnf clean all
90
+ # RUN --mount=type=cache,target=/iptables,from=iptables,source=/iptables,readonly \
91
+ # cd /iptables && ./iptables-wrapper-installer.sh --no-sanity-check --no-cleanup
94
92
95
93
#FROM base-release AS base-dev
96
94
RUN dnf install -y libvirt-libs /usr/bin/ssh && dnf clean all
0 commit comments