Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-SMF
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
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-SMF
Commits
d250d329
Commit
d250d329
authored
Sep 13, 2022
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(docker): some typos
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@openairinterface.org
>
parent
39d197b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
build/scripts/build_helper.smf
build/scripts/build_helper.smf
+0
-2
ci-scripts/docker/Dockerfile.ci.ubuntu.18.04
ci-scripts/docker/Dockerfile.ci.ubuntu.18.04
+3
-4
docker/Dockerfile.smf.ubuntu
docker/Dockerfile.smf.ubuntu
+4
-3
No files found.
build/scripts/build_helper.smf
View file @
d250d329
...
@@ -368,8 +368,6 @@ check_install_smf_deps() {
...
@@ -368,8 +368,6 @@ check_install_smf_deps() {
libconfig-devel \
libconfig-devel \
libgcrypt-devel \
libgcrypt-devel \
gmp-devel \
gmp-devel \
lksctp-tools \
lksctp-tools-devel \
openssl-devel \
openssl-devel \
libtool \
libtool \
libxml2 \
libxml2 \
...
...
ci-scripts/docker/Dockerfile.ci.ubuntu.18.04
View file @
d250d329
...
@@ -47,7 +47,7 @@ RUN ldconfig && \
...
@@ -47,7 +47,7 @@ RUN ldconfig && \
#---------------------------------------------------------------------
#---------------------------------------------------------------------
# TARGET IMAGE
# TARGET IMAGE
#---------------------------------------------------------------------
#---------------------------------------------------------------------
FROM
ubuntu:bionic
as oai-smf
FROM
$BASE_IMAGE
as oai-smf
ENV DEBIAN_FRONTEND=noninteractive
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Paris
ENV TZ=Europe/Paris
# We install some debug tools for the moment in addition of mandatory libraries
# We install some debug tools for the moment in addition of mandatory libraries
...
@@ -111,16 +111,15 @@ RUN ldconfig && \
...
@@ -111,16 +111,15 @@ RUN ldconfig && \
WORKDIR /openair-smf/etc
WORKDIR /openair-smf/etc
COPY --from=oai-smf-builder /openair-smf/etc/smf.conf .
COPY --from=oai-smf-builder /openair-smf/etc/smf.conf .
WORKDIR /openair-smf
# expose ports
# expose ports
WORKDIR /openair-smf
EXPOSE 80/tcp 9090/tcp 8805/udp
# healthcheck
# healthcheck
HEALTHCHECK --interval=10s \
HEALTHCHECK --interval=10s \
--timeout=15s \
--timeout=15s \
--retries=6 \
--retries=6 \
CMD /openair-smf/bin/healthcheck.sh
CMD /openair-smf/bin/healthcheck.sh
EXPOSE 80/tcp 9090/tcp 8805/udp
ENTRYPOINT ["/bin/bash","/openair-smf/bin/entrypoint.sh"]
ENTRYPOINT ["/bin/bash","/openair-smf/bin/entrypoint.sh"]
CMD ["/openair-smf/bin/oai_smf", "-c", "/openair-smf/etc/smf.conf", "-o"]
CMD ["/openair-smf/bin/oai_smf", "-c", "/openair-smf/etc/smf.conf", "-o"]
docker/Dockerfile.smf.ubuntu
View file @
d250d329
...
@@ -86,6 +86,7 @@ RUN apt-get update && \
...
@@ -86,6 +86,7 @@ RUN apt-get update && \
# Ubuntu 18 --> libasan4
# Ubuntu 18 --> libasan4
# Ubuntu 20 --> libasan5
# Ubuntu 20 --> libasan5
# Ubuntu 22 --> libasan6
# Ubuntu 22 --> libasan6
libasan? \
libgssapi-krb5-2 \
libgssapi-krb5-2 \
# Ubuntu 18/20 --> libldap-2.4-2
# Ubuntu 18/20 --> libldap-2.4-2
# Ubuntu 22 --> libldap-2.5-0
# Ubuntu 22 --> libldap-2.5-0
...
@@ -119,6 +120,7 @@ COPY --from=oai-smf-builder \
...
@@ -119,6 +120,7 @@ COPY --from=oai-smf-builder \
/usr/local/lib/libnghttp2.so.14 \
/usr/local/lib/libnghttp2.so.14 \
/usr/local/lib/libnghttp2_asio.so.1 \
/usr/local/lib/libnghttp2_asio.so.1 \
/usr/local/lib/libpistache.so \
/usr/local/lib/libpistache.so \
/openair-smf/build/smf/build/nas/libNAS.so \
# Ubuntu 18 --> boost 67 will be copied
# Ubuntu 18 --> boost 67 will be copied
/usr/lib/libboost_system.so.1.* \
/usr/lib/libboost_system.so.1.* \
/usr/lib/libboost_thread.so.1.* \
/usr/lib/libboost_thread.so.1.* \
...
@@ -133,16 +135,15 @@ RUN ldconfig && \
...
@@ -133,16 +135,15 @@ RUN ldconfig && \
WORKDIR /openair-smf/etc
WORKDIR /openair-smf/etc
COPY --from=oai-smf-builder /openair-smf/etc/smf.conf .
COPY --from=oai-smf-builder /openair-smf/etc/smf.conf .
WORKDIR /openair-smf
# expose ports
# expose ports
WORKDIR /openair-smf
EXPOSE 80/tcp 9090/tcp 8805/udp
# healthcheck
# healthcheck
HEALTHCHECK --interval=10s \
HEALTHCHECK --interval=10s \
--timeout=15s \
--timeout=15s \
--retries=6 \
--retries=6 \
CMD /openair-smf/bin/healthcheck.sh
CMD /openair-smf/bin/healthcheck.sh
EXPOSE 80/tcp 9090/tcp 8805/udp
ENTRYPOINT ["/bin/bash","/openair-smf/bin/entrypoint.sh"]
ENTRYPOINT ["/bin/bash","/openair-smf/bin/entrypoint.sh"]
CMD ["/openair-smf/bin/oai_smf", "-c", "/openair-smf/etc/smf.conf", "-o"]
CMD ["/openair-smf/bin/oai_smf", "-c", "/openair-smf/etc/smf.conf", "-o"]
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