diff --git a/dist/images/Dockerfile b/dist/images/Dockerfile index 091625fb688..bc953460670 100644 --- a/dist/images/Dockerfile +++ b/dist/images/Dockerfile @@ -1,6 +1,13 @@ # syntax = docker/dockerfile:experimental FROM kubeovn/kube-ovn-base:v1.9.3 +ARG ARCH +ENV DUMB_INIT_VERSION="1.2.5" +RUN dump_arch="x86_64"; \ + if [ "$ARCH" = "arm64" ]; then dump_arch="aarch64"; fi; \ + curl -sSf -L --retry 5 -o /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_${dump_arch} && \ + chmod +x /usr/bin/dumb-init + COPY *.sh /kube-ovn/ COPY kubectl-ko /kube-ovn/kubectl-ko COPY 01-kube-ovn.conflist /kube-ovn/01-kube-ovn.conflist @@ -17,4 +24,6 @@ RUN ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-controller && \ ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-monitor && \ ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-pinger && \ ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-speaker && \ - ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-controller-healthcheck \ No newline at end of file + ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-controller-healthcheck + +ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base index 3b52de029f2..b4f7710beba 100644 --- a/dist/images/Dockerfile.base +++ b/dist/images/Dockerfile.base @@ -76,11 +76,3 @@ RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages \ dpkg -i /packages/openvswitch-*.deb && \ dpkg -i /packages/python3-openvswitch*.deb &&\ dpkg -i --ignore-depends=openvswitch-switch,openvswitch-common /packages/ovn-*.deb - -ENV DUMB_INIT_VERSION="1.2.5" -RUN dump_arch="x86_64"; \ - if [ "$ARCH" = "arm64" ]; then dump_arch="aarch64"; fi; \ - curl -sSf -L --retry 5 -o /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_${dump_arch} && \ - chmod +x /usr/bin/dumb-init - -ENTRYPOINT ["/usr/bin/dumb-init", "--"]