diff --git a/docker/Dockerfile.base.rhel9 b/docker/Dockerfile.base.rhel9 index dee50127ac..784ac534c3 100644 --- a/docker/Dockerfile.base.rhel9 +++ b/docker/Dockerfile.base.rhel9 @@ -29,6 +29,7 @@ FROM registry.access.redhat.com/ubi9/ubi:latest AS ran-base LABEL MAINTAINER OpenAirInterface ARG NEEDED_GIT_PROXY +ARG TARGETARCH ENV TZ=Europe/Paris ENV BUILD_UHD_FROM_SOURCE=True ENV UHD_VERSION=4.4.0.0 @@ -68,7 +69,7 @@ RUN rm -f /etc/rhsm-host && \ # Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini # it will be copied into target containers, to print exit numbers and handle signals properly ENV TINI_VERSION=v0.19.0 -ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini +ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini RUN chmod +x /tini # In some network environments, GIT proxy is required diff --git a/docker/Dockerfile.base.rocky b/docker/Dockerfile.base.rocky index 44be527344..2d83389418 100644 --- a/docker/Dockerfile.base.rocky +++ b/docker/Dockerfile.base.rocky @@ -27,7 +27,7 @@ ARG BASE_IMAGE=docker.io/rockylinux:9 FROM $BASE_IMAGE AS ran-base - +ARG TARGETARCH ENV TZ=Europe/Paris ENV BUILD_UHD_FROM_SOURCE=True ENV UHD_VERSION=4.4.0.0 @@ -63,7 +63,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ # Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini # it will be copied into target containers, to print exit numbers and handle signals properly ENV TINI_VERSION=v0.19.0 -ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini +ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini RUN chmod +x /tini # Copying only the needed files to create ran-base diff --git a/docker/Dockerfile.base.ubuntu22 b/docker/Dockerfile.base.ubuntu22 index f23cf01ac0..ad237a3ac2 100644 --- a/docker/Dockerfile.base.ubuntu22 +++ b/docker/Dockerfile.base.ubuntu22 @@ -28,6 +28,7 @@ FROM ubuntu:jammy AS ran-base ARG NEEDED_GIT_PROXY +ARG TARGETARCH ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris ENV BUILD_UHD_FROM_SOURCE=True @@ -58,7 +59,7 @@ RUN apt-get update && \ # Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini # it will be copied into target containers, to print exit numbers and handle signals properly ENV TINI_VERSION=v0.19.0 -ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini +ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini RUN chmod +x /tini # In some network environments, GIT proxy is required