@@ -105,7 +105,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
105105 apt install -y wget build-essential fakeroot && \
106106 sleep 15 && \
107107 apt install -y autoconf automake bzip2 debhelper-compat dh-exec dh-python dh-sequence-python3 dh-sequence-sphinxdoc \
108- graphviz iproute2 libcap-ng-dev libdbus-1-dev libnuma-dev libpcap-dev libssl-dev libtool libunbound-dev \
108+ graphviz iproute2 libcap-ng-dev libdbus-1-dev libnuma-dev libpcap-dev libtool libunbound-dev \
109109 pkg-config procps python3-all-dev python3-setuptools python3-sortedcontainers python3-sphinx
110110
111111RUN cd /usr/src/ovs && \
@@ -140,16 +140,6 @@ RUN cd /usr/src/openbfdd && \
140140 ./configure --enable-silent-rules && \
141141 make
142142
143- ENV OPENSSL_FIPS_LIBDIR=/usr/local/openssl-fips/lib
144- ENV LD_LIBRARY_PATH=$OPENSSL_FIPS_LIBDIR:$LD_LIBRARY_PATH
145- RUN wget https://www.openssl.org/source/openssl-3.0.13.tar.gz && \
146- tar -xzf openssl-3.0.13.tar.gz && \
147- cd openssl-3.0.13 && \
148- ./config --prefix=/usr/local/openssl-fips --libdir=lib enable-fips && \
149- make -j8 && \
150- make install && \
151- /usr/local/openssl-fips/bin/openssl fipsinstall -module $OPENSSL_FIPS_LIBDIR/ossl-modules/fips.so -out /usr/local/openssl-fips/ssl/fipsmodule.cnf
152-
153143RUN mkdir /packages/ && \
154144 mv /usr/src/openbfdd/bfdd-beacon /usr/src/openbfdd/bfdd-control /packages/ && \
155145 cp /usr/src/openvswitch-*deb /packages && \
@@ -187,7 +177,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
187177 --mount=type=cache,target=/var/lib/apt,sharing=locked \
188178 apt update && apt upgrade -y && apt install ca-certificates python3 hostname libunwind8 netbase \
189179 ethtool iproute2 ncat libunbound8 procps libatomic1 kmod iptables python3-netifaces python3-sortedcontainers \
190- tcpdump ipvsadm ipset curl uuid-runtime openssl inetutils-ping arping ndisc6 conntrack traceroute iputils-tracepath \
180+ tcpdump ipvsadm ipset uuid-runtime inetutils-ping arping ndisc6 conntrack traceroute iputils-tracepath \
191181 logrotate dnsutils net-tools strongswan strongswan-pki libcharon-extra-plugins libmnl0 \
192182 libcharon-extauth-plugins libstrongswan-extra-plugins libstrongswan-standard-plugins -y --no-install-recommends && \
193183 setcap CAP_NET_ADMIN+eip $(readlink -f $(which conntrack)) && \
@@ -244,17 +234,4 @@ RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages \
244234 dpkg -i --ignore-depends=openvswitch-switch,openvswitch-common /packages/*.ddeb; \
245235 fi
246236
247- RUN if [ "$ARCH" = "amd64" ]; then \
248- # env OPENSSL_CONF is only work when user is root, not effect when user is nobody, maybe openssl bug, so we copy openssl binary and libraries to /usr/bin and /usr/lib/x86_64-linux-gnu
249- cp /usr/local/openssl-fips/bin/openssl /usr/bin/openssl && \
250- cp /usr/local/openssl-fips/lib/libssl.so.3 /usr/lib/x86_64-linux-gnu/libssl.so.3 && \
251- cp /usr/local/openssl-fips/lib/libcrypto.so.3 /usr/lib/x86_64-linux-gnu/libcrypto.so.3 && \
252- cp /usr/local/openssl-fips/lib/ossl-modules/fips.so /usr/lib/x86_64-linux-gnu/ossl-modules/; \
253- elif [ "$ARCH" = "arm64" ]; then \
254- cp /usr/local/openssl-fips/bin/openssl /usr/bin/openssl && \
255- cp /usr/local/openssl-fips/lib/libssl.so.3 /usr/lib/aarch64-linux-gnu/libssl.so.3 && \
256- cp /usr/local/openssl-fips/lib/libcrypto.so.3 /usr/lib/aarch64-linux-gnu/libcrypto.so.3 && \
257- cp /usr/local/openssl-fips/lib/ossl-modules/fips.so /usr/lib/aarch64-linux-gnu/ossl-modules/; \
258- fi
259-
260237ENTRYPOINT ["/usr/bin/dumb-init", "--"]
0 commit comments