Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-UPF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-UPF
Commits
e8a16c50
Commit
e8a16c50
authored
Sep 14, 2022
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ubuntu-22.04-support' into 'develop'
Ubuntu22.04 support See merge request oai/cn5g/oai-cn5g-upf-vpp!36
parents
9a49dc18
c79fc3b8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
13 deletions
+26
-13
ci-scripts/docker/Dockerfile.upf-vpp.ubuntu
ci-scripts/docker/Dockerfile.upf-vpp.ubuntu
+2
-2
docker/Dockerfile.upf-vpp.rhel7
docker/Dockerfile.upf-vpp.rhel7
+0
-3
docker/Dockerfile.upf-vpp.ubuntu
docker/Dockerfile.upf-vpp.ubuntu
+1
-3
docs/BUILD_IMAGE.md
docs/BUILD_IMAGE.md
+12
-5
scripts/patches/werror_disable.patch
scripts/patches/werror_disable.patch
+11
-0
No files found.
ci-scripts/docker/Dockerfile.upf-vpp.ubuntu
View file @
e8a16c50
...
...
@@ -28,7 +28,7 @@
# BUILDER IMAGE
#---------------------------------------------------------------------
ARG BASE_IMAGE=ubuntu:
18.04
ARG BASE_IMAGE=ubuntu:
bionic
FROM vpp-upf-base:latest AS vpp-upf-builder
WORKDIR /vpp-upf
...
...
@@ -90,12 +90,12 @@ COPY --from=vpp-upf-builder \
/usr/lib/x86_64-linux-gnu/vpp_plugins/
COPY --from=vpp-upf-builder \
# /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libnat.so.21.01.1 \
/vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvppinfra.so.21.01.1 \
/vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvnet.so.21.01.1 \
/vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvlibmemory.so.21.01.1 \
/vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvlib.so.21.01.1 \
/vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libsvm.so.21.01.1 \
# /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libnat.so.21.01.1 \
/usr/lib/x86_64-linux-gnu/
RUN ldconfig && \
...
...
docker/Dockerfile.upf-vpp.rhel7
View file @
e8a16c50
...
...
@@ -30,8 +30,6 @@
#---------------------------------------------------------------------
FROM registry.access.redhat.com/ubi7/ubi:latest AS vpp-upf-builder
ARG NEEDED_GIT_PROXY
# Copy the entitlements
COPY ./etc-pki-entitlement /etc/pki/entitlement
...
...
@@ -57,7 +55,6 @@ RUN rm -f /etc/rhsm-host && \
sudo
# Some GIT configuration command quite useful
RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
RUN git config --global https.postBuffer 123289600 && \
git config --global http.sslverify false
...
...
docker/Dockerfile.upf-vpp.ubuntu
View file @
e8a16c50
...
...
@@ -28,10 +28,9 @@
# BUILDER IMAGE
#---------------------------------------------------------------------
ARG BASE_IMAGE=ubuntu:
18.04
ARG BASE_IMAGE=ubuntu:
bionic
FROM $BASE_IMAGE AS vpp-upf-builder
ARG NEEDED_GIT_PROXY
ENV DEBIAN_FRONTEND=noninteractive
# Installing hyperscan library for upf plugin
...
...
@@ -49,7 +48,6 @@ RUN apt update && \
# Some GIT configuration commands quite useful
RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
RUN git config --global https.postBuffer 123289600 && \
git config --global http.sslverify false
...
...
docs/BUILD_IMAGE.md
View file @
e8a16c50
...
...
@@ -21,7 +21,7 @@ Here in our network configuration, we need to pass the "GIT PROXY" configuration
```
bash
$
docker build
--target
oai-upf-vpp
--tag
oai-upf-vpp:latest
\
--file
docker/Dockerfile.upf-vpp.ubuntu
\
--build-arg
NEEDED_GIT_PROXY
=
"http://proxy.eurecom.fr:8080"
.
.
```
## 3.2 On a Ubuntu 20.04 Host ##
...
...
@@ -29,14 +29,21 @@ $ docker build --target oai-upf-vpp --tag oai-upf-vpp:latest \
```
bash
$
docker build
--target
oai-upf-vpp
--tag
oai-upf-vpp:latest
\
--file
docker/Dockerfile.upf-vpp.ubuntu
\
--build-arg
NEEDED_GIT_PROXY
=
"http://proxy.eurecom.fr:8080"
\
--build-arg
BASE_IMAGE
=
ubuntu:20.04 .
--build-arg
BASE_IMAGE
=
ubuntu:focal .
```
## 3.3 On a RHEL 7 Host ##
## 3.3 On a Ubuntu 22.04 Host ##
```
bash
$
docker build
--target
oai-upf-vpp
--tag
oai-upf-vpp:latest
\
--file
docker/Dockerfile.upf-vpp.ubuntu
\
--build-arg
BASE_IMAGE
=
ubuntu:jammy .
```
## 3.4 On a RHEL 7 Host ##
```
bash
$
docker build
--target
oai-upf-vpp
--tag
oai-upf-vpp:latest
\
--file
docker/Dockerfile.upf-vpp.rhel7
\
--build-arg
NEEDED_GIT_PROXY
=
"http://proxy.eurecom.fr:8080"
.
.
```
scripts/patches/werror_disable.patch
View file @
e8a16c50
...
...
@@ -11,4 +11,15 @@
if (compiler_flag_no_address_of_packed_member)
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@
# +libganglia1-dev if building the gmond plugin
DEB_DEPENDS = curl build-essential autoconf automake ccache
-DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd dh-python
+DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-python
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
DEB_DEPENDS += python3-all python3-setuptools check
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