maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tini-for-arm' into integration_2024_w39

Browse Source
This commit is contained in:
Jaroslava Fiedlerova
2024-09-27 11:17:07 +02:00
parent e0800d4225 af1158140e
commit 6b9ddbabd2
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile.base.rhel9
+2 -1
View File
@@ -29,6 +29,7 @@
FROM registry.access.redhat.com/ubi9/ubi:latest AS ran-base FROM registry.access.redhat.com/ubi9/ubi:latest AS ran-base
LABEL MAINTAINER OpenAirInterface <contact@openairinterface.org> LABEL MAINTAINER OpenAirInterface <contact@openairinterface.org>
ARG NEEDED_GIT_PROXY ARG NEEDED_GIT_PROXY
ARG TARGETARCH
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
ENV BUILD_UHD_FROM_SOURCE=True ENV BUILD_UHD_FROM_SOURCE=True
ENV UHD_VERSION=4.4.0.0 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 # 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 # it will be copied into target containers, to print exit numbers and handle signals properly
ENV TINI_VERSION=v0.19.0 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 RUN chmod +x /tini
# In some network environments, GIT proxy is required # In some network environments, GIT proxy is required
docker/Dockerfile.base.rocky
+2 -2
View File
@@ -27,7 +27,7 @@
ARG BASE_IMAGE=docker.io/rockylinux:9 ARG BASE_IMAGE=docker.io/rockylinux:9
FROM $BASE_IMAGE AS ran-base FROM $BASE_IMAGE AS ran-base
ARG TARGETARCH
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
ENV BUILD_UHD_FROM_SOURCE=True ENV BUILD_UHD_FROM_SOURCE=True
ENV UHD_VERSION=4.4.0.0 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 # 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 # it will be copied into target containers, to print exit numbers and handle signals properly
ENV TINI_VERSION=v0.19.0 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 RUN chmod +x /tini
# Copying only the needed files to create ran-base # Copying only the needed files to create ran-base
docker/Dockerfile.base.ubuntu22
+2 -1
View File
@@ -28,6 +28,7 @@
FROM ubuntu:jammy AS ran-base FROM ubuntu:jammy AS ran-base
ARG NEEDED_GIT_PROXY ARG NEEDED_GIT_PROXY
ARG TARGETARCH
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
ENV BUILD_UHD_FROM_SOURCE=True 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 # 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 # it will be copied into target containers, to print exit numbers and handle signals properly
ENV TINI_VERSION=v0.19.0 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 RUN chmod +x /tini
# In some network environments, GIT proxy is required # In some network environments, GIT proxy is required