Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
OpenXG-RAN
Commits
a834c10b
Commit
a834c10b
authored
1 year ago
by
Robert Schmidt
Committed by
Jaroslava Fiedlerova
1 year ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RHEL9 container build/build_oai: switch to dnf
parent
a553b4c6
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
22 additions
and
22 deletions
+22
-22
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+1
-1
docker/Dockerfile.base.rhel9
docker/Dockerfile.base.rhel9
+3
-3
docker/Dockerfile.clang.rhel9
docker/Dockerfile.clang.rhel9
+1
-1
docker/Dockerfile.eNB.rhel9
docker/Dockerfile.eNB.rhel9
+2
-2
docker/Dockerfile.gNB.aw2s.rhel9
docker/Dockerfile.gNB.aw2s.rhel9
+3
-3
docker/Dockerfile.gNB.rhel9
docker/Dockerfile.gNB.rhel9
+3
-3
docker/Dockerfile.lteRU.rhel9
docker/Dockerfile.lteRU.rhel9
+2
-2
docker/Dockerfile.lteUE.rhel9
docker/Dockerfile.lteUE.rhel9
+2
-2
docker/Dockerfile.nrUE.rhel9
docker/Dockerfile.nrUE.rhel9
+2
-2
docker/Dockerfile.phySim.rhel9
docker/Dockerfile.phySim.rhel9
+3
-3
No files found.
cmake_targets/tools/build_helper
View file @
a834c10b
...
...
@@ -32,7 +32,7 @@ OS_DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//" | sed "s/\"//g")
OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "s/\"//g")
case "$OS_DISTRO" in
fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
rhel) OS_BASEDISTRO="fedora"; INSTALLER="
yum
"; CMAKE="cmake3" ;;
rhel) OS_BASEDISTRO="fedora"; INSTALLER="
dnf
"; CMAKE="cmake3" ;;
rocky) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;;
debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.base.rhel9
View file @
a834c10b
...
...
@@ -42,11 +42,11 @@ COPY ./rhsm-ca /etc/rhsm/ca
ENV SMDEV_CONTAINER_OFF=1
#install developers pkg/repo
RUN rm -f /etc/rhsm-host && \
yum
repolist --disablerepo=* && \
dnf
repolist --disablerepo=* && \
subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms && \
dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -y && \
yum
update -y && \
yum
install -y \
dnf
update -y && \
dnf
install -y \
#gcc needed for build_oai
gcc gcc-c++ \
diffutils \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.clang.rhel9
View file @
a834c10b
...
...
@@ -32,7 +32,7 @@ WORKDIR /oai-ran
COPY . .
#only install LLVM (clang, ...) for this container, the others don't need it
RUN
yum
install -y llvm-toolset
RUN
dnf
install -y llvm-toolset
#run build_oai to build the target image
RUN /bin/sh oaienv && \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.eNB.rhel9
View file @
a834c10b
...
...
@@ -36,8 +36,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-enb
ENV TZ=Europe/Paris
RUN
yum
update -y && \
yum
install -y --enablerepo="ubi-9-codeready-builder" \
RUN
dnf
update -y && \
dnf
install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \
tzdata \
procps-ng \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.gNB.aw2s.rhel9
View file @
a834c10b
...
...
@@ -41,9 +41,9 @@ RUN /bin/sh oaienv && \
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb-aw2s
ENV TZ=Europe/Paris
RUN
yum
repolist --disablerepo=* && \
yum
update -y && \
yum
install -y --enablerepo="ubi-9-codeready-builder" \
RUN
dnf
repolist --disablerepo=* && \
dnf
update -y && \
dnf
install -y --enablerepo="ubi-9-codeready-builder" \
procps-ng \
libXpm \
libX11 \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.gNB.rhel9
View file @
a834c10b
...
...
@@ -36,9 +36,9 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb
ENV TZ=Europe/Paris
RUN
yum
repolist --disablerepo=* && \
yum
update -y && \
yum
install -y --enablerepo="ubi-9-codeready-builder" \
RUN
dnf
repolist --disablerepo=* && \
dnf
update -y && \
dnf
install -y --enablerepo="ubi-9-codeready-builder" \
procps-ng \
libXpm \
libX11 \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.lteRU.rhel9
View file @
a834c10b
...
...
@@ -36,8 +36,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ru
ENV TZ=Europe/Paris
RUN
yum
update -y && \
yum
install -y --enablerepo="ubi-9-codeready-builder" \
RUN
dnf
update -y && \
dnf
install -y --enablerepo="ubi-9-codeready-builder" \
tzdata \
procps-ng \
atlas \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.lteUE.rhel9
View file @
a834c10b
...
...
@@ -37,8 +37,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_paramet
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ue
ENV TZ=Europe/Paris
RUN
yum
update -y && \
yum
install -y --enablerepo="ubi-9-codeready-builder" \
RUN
dnf
update -y && \
dnf
install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \
procps-ng \
tzdata \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.nrUE.rhel9
View file @
a834c10b
...
...
@@ -36,8 +36,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_paramete
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-nr-ue
ENV TZ=Europe/Paris
RUN
yum
update -y && \
yum
install -y --enablerepo="ubi-9-codeready-builder" \
RUN
dnf
update -y && \
dnf
install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \
procps-ng \
tzdata \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.phySim.rhel9
View file @
a834c10b
...
...
@@ -32,7 +32,7 @@ WORKDIR /oai-ran
COPY . .
#only install address and undefined behavior sanitizer for this container, the others don't need it
RUN
yum
install -y libasan libubsan
RUN
dnf
install -y libasan libubsan
#run build_oai to build the target image
RUN /bin/sh oaienv && \
...
...
@@ -43,8 +43,8 @@ RUN /bin/sh oaienv && \
#start from scratch for target executable
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-physim
RUN
yum
update -y && \
yum
install -y --enablerepo="ubi-9-codeready-builder" \
RUN
dnf
update -y && \
dnf
install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \
tzdata \
atlas \
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment