Skip to content

Commit

Permalink
test revert
Browse files Browse the repository at this point in the history
  • Loading branch information
mgleung committed Oct 15, 2021
1 parent f10c5d6 commit 6ff0cbd
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
ARG ARCH=x86_64
ARG GIT_VERSION=unknown
ARG IPTABLES_VER=1.8.4-17
ARG IPTABLES_VER=1.8.4-15
ARG LIBNFTNL_VER=1.1.5-4
ARG RUNIT_VER=2.1.2
ARG BIRD_IMAGE=calico/bird:latest
Expand All @@ -31,7 +31,7 @@ ARG ARCH
ARG IPTABLES_VER
ARG LIBNFTNL_VER
ARG RUNIT_VER
ARG CENTOS_MIRROR_BASE_URL=https://vault.centos.org/8.4.2105
ARG CENTOS_MIRROR_BASE_URL=http://vault.centos.org/8.3.2011
ARG LIBNFTNL_SOURCERPM_URL=${CENTOS_MIRROR_BASE_URL}/BaseOS/Source/SPackages/libnftnl-${LIBNFTNL_VER}.el8.src.rpm
ARG IPTABLES_SOURCERPM_URL=${CENTOS_MIRROR_BASE_URL}/BaseOS/Source/SPackages/iptables-${IPTABLES_VER}.el8.src.rpm

Expand Down Expand Up @@ -88,14 +88,13 @@ RUN sed -i '/%files$/a \
RUN rpmbuild -bb /root/rpmbuild/SPECS/iptables.spec

# runit is not available in ubi or CentOS repos so build it.
# get it from the debian repos as the official website doesn't support https
RUN wget -P /tmp https://ftp.debian.org/debian/pool/main/r/runit/runit_${RUNIT_VER}.orig.tar.gz && \
gunzip /tmp/runit_${RUNIT_VER}.orig.tar.gz && \
tar -xpf /tmp/runit_${RUNIT_VER}.orig.tar -C /tmp && \
RUN wget -P /tmp http://smarden.org/runit/runit-${RUNIT_VER}.tar.gz && \
gunzip /tmp/runit-${RUNIT_VER}.tar.gz && \
tar -xpf /tmp/runit-${RUNIT_VER}.tar -C /tmp && \
cd /tmp/admin/runit-${RUNIT_VER}/ && \
package/install

FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 as ubi
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 as ubi
ARG ARCH
ARG GIT_VERSION
ARG IPTABLES_VER
Expand Down

0 comments on commit 6ff0cbd

Please sign in to comment.