Commit 76ed3433 authored by Raphael Defosseux's avatar Raphael Defosseux

Merge branch 'entrypoint-u18' into 'develop'

adding copy entrypoint in U18 dockerfile

See merge request oai/cn5g/oai-cn5g-smf!46
parents 063945ab ec32ec1a
...@@ -317,7 +317,7 @@ pipeline { ...@@ -317,7 +317,7 @@ pipeline {
if (fileExists('test_results_oai_smf.html')) { if (fileExists('test_results_oai_smf.html')) {
archiveArtifacts artifacts: 'test_results_oai_smf.html' archiveArtifacts artifacts: 'test_results_oai_smf.html'
} }
if (fileExists('deploy_results_oai_cn5g.html')) { if (fileExists('test_results_oai_cn5g.html')) {
sh "sed -i -e 's#TEMPLATE_TIME#${JOB_TIMESTAMP}#' *_results_oai_cn5g.html" sh "sed -i -e 's#TEMPLATE_TIME#${JOB_TIMESTAMP}#' *_results_oai_cn5g.html"
archiveArtifacts artifacts: '*_results_oai_cn5g.html' archiveArtifacts artifacts: '*_results_oai_cn5g.html'
} }
......
...@@ -77,6 +77,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && DE ...@@ -77,6 +77,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && DE
# Copying executable and generated libraries # Copying executable and generated libraries
WORKDIR /openair-smf/bin WORKDIR /openair-smf/bin
COPY --from=oai-smf-builder /openair-smf/build/smf/build/smf oai_smf COPY --from=oai-smf-builder /openair-smf/build/smf/build/smf oai_smf
COPY --from=oai-smf-builder /openair-smf/scripts/entrypoint.sh entrypoint.sh
COPY --from=oai-smf-builder /usr/local/lib/libpistache.so /usr/local/lib/ COPY --from=oai-smf-builder /usr/local/lib/libpistache.so /usr/local/lib/
COPY --from=oai-smf-builder /usr/local/lib/libnghttp2_asio.so.1 /usr/local/lib/ COPY --from=oai-smf-builder /usr/local/lib/libnghttp2_asio.so.1 /usr/local/lib/
COPY --from=oai-smf-builder /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 /usr/lib/x86_64-linux-gnu/ COPY --from=oai-smf-builder /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 /usr/lib/x86_64-linux-gnu/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment