diff --git a/base/Dockerfile b/base/Dockerfile index 02395ce..33c7b6c 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -27,7 +27,6 @@ FROM ubuntu:focal as builder ENV DEBIAN_FRONTEND=noninteractive -ENV LD_LIBRARY_PATH=/open5gs/install/lib/x86_64-linux-gnu # Install updates and dependencies RUN apt-get update && \ @@ -76,7 +75,6 @@ RUN cd open5gs/webui && npm clean-install && npm run build FROM ubuntu:focal ENV DEBIAN_FRONTEND=noninteractive -ENV LD_LIBRARY_PATH=/open5gs/install/lib/x86_64-linux-gnu RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/base/open5gs_init.sh b/base/open5gs_init.sh index dea728c..05a0e98 100755 --- a/base/open5gs_init.sh +++ b/base/open5gs_init.sh @@ -26,6 +26,8 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +export LD_LIBRARY_PATH=/open5gs/install/lib/$(uname -m)-linux-gnu + if [[ -z "$COMPONENT_NAME" ]]; then echo "Error: COMPONENT_NAME environment variable not set"; exit 1; elif [[ "$COMPONENT_NAME" =~ ^(amf-[[:digit:]]+$) ]]; then diff --git a/hss/hss.conf b/hss/hss.conf index 5c262c7..31f99c0 100644 --- a/hss/hss.conf +++ b/hss/hss.conf @@ -221,13 +221,13 @@ TLS_CA = "/open5gs/install/etc/freeDiameter/cacert.pem"; # 4 - full - display the complete information on a single long line # 8 - tree - display the complete information in an easier to read format spanning several lines. -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_rfc5777.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_mip6i.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_nasreq.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_nas_mipv6.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_dcca.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_dcca_3gpp.fdx"; ############################################################## diff --git a/hss/hss_init.sh b/hss/hss_init.sh index 8bbaa6e..29da25d 100755 --- a/hss/hss_init.sh +++ b/hss/hss_init.sh @@ -39,6 +39,7 @@ cp /mnt/hss/make_certs.sh install/etc/freeDiameter sed -i 's|HSS_IP|'$HSS_IP'|g' install/etc/freeDiameter/hss.conf sed -i 's|MME_IP|'$MME_IP'|g' install/etc/freeDiameter/hss.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/hss.conf +sed -i 's|LD_LIBRARY_PATH|'$LD_LIBRARY_PATH'|g' install/etc/freeDiameter/hss.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/make_certs.sh sed -i 's|MONGO_IP|'$MONGO_IP'|g' install/etc/open5gs/hss.yaml diff --git a/mme/mme.conf b/mme/mme.conf index ef95f7d..1a0b815 100644 --- a/mme/mme.conf +++ b/mme/mme.conf @@ -222,13 +222,13 @@ TLS_CA = "/open5gs/install/etc/freeDiameter/cacert.pem"; # 4 - full - display the complete information on a single long line # 8 - tree - display the complete information in an easier to read format spanning several lines. -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_rfc5777.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_mip6i.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_nasreq.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_nas_mipv6.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_dcca.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_dcca_3gpp.fdx"; ############################################################## diff --git a/mme/mme_init.sh b/mme/mme_init.sh index 244cf29..c7892e9 100755 --- a/mme/mme_init.sh +++ b/mme/mme_init.sh @@ -45,6 +45,7 @@ sed -i 's|SMF_IP|'$SMF_IP'|g' install/etc/open5gs/mme.yaml sed -i 's|MME_IP|'$MME_IP'|g' install/etc/freeDiameter/mme.conf sed -i 's|HSS_IP|'$HSS_IP'|g' install/etc/freeDiameter/mme.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/mme.conf +sed -i 's|LD_LIBRARY_PATH|'$LD_LIBRARY_PATH'|g' install/etc/freeDiameter/mme.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/make_certs.sh # Generate TLS certificates diff --git a/pcrf/pcrf.conf b/pcrf/pcrf.conf index 8789283..f1306d5 100644 --- a/pcrf/pcrf.conf +++ b/pcrf/pcrf.conf @@ -222,13 +222,13 @@ TLS_CA = "/open5gs/install/etc/freeDiameter/cacert.pem"; # 4 - full - display the complete information on a single long line # 8 - tree - display the complete information in an easier to read format spanning several lines. -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_rfc5777.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_mip6i.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_nasreq.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_nas_mipv6.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_dcca.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_dcca_3gpp.fdx"; ############################################################## diff --git a/pcrf/pcrf_init.sh b/pcrf/pcrf_init.sh index f102d8e..5c12e75 100755 --- a/pcrf/pcrf_init.sh +++ b/pcrf/pcrf_init.sh @@ -42,6 +42,7 @@ sed -i 's|SMF_IP|'$SMF_IP'|g' install/etc/freeDiameter/pcrf.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/pcrf.conf sed -i 's|IMS_DOMAIN|'$IMS_DOMAIN'|g' install/etc/freeDiameter/pcrf.conf sed -i 's|PCSCF_IP|'$PCSCF_IP'|g' install/etc/freeDiameter/pcrf.conf +sed -i 's|LD_LIBRARY_PATH|'$LD_LIBRARY_PATH'|g' install/etc/freeDiameter/pcrf.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/make_certs.sh # Generate TLS certificates diff --git a/smf/smf.conf b/smf/smf.conf index 6df862f..2f3b3fd 100644 --- a/smf/smf.conf +++ b/smf/smf.conf @@ -222,13 +222,13 @@ TLS_CA = "/open5gs/install/etc/freeDiameter/cacert.pem"; # 4 - full - display the complete information on a single long line # 8 - tree - display the complete information in an easier to read format spanning several lines. -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx"; -LoadExtension = "/open5gs/install/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_rfc5777.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_mip6i.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_nasreq.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_nas_mipv6.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_dcca.fdx"; +LoadExtension = "LD_LIBRARY_PATH/freeDiameter/dict_dcca_3gpp.fdx"; ############################################################## diff --git a/smf/smf_init.sh b/smf/smf_init.sh index 45cabd9..b1ce446 100755 --- a/smf/smf_init.sh +++ b/smf/smf_init.sh @@ -50,6 +50,7 @@ sed -i 's|PCSCF_IP|'$PCSCF_IP'|g' install/etc/open5gs/smf.yaml sed -i 's|SMF_IP|'$SMF_IP'|g' install/etc/freeDiameter/smf.conf sed -i 's|PCRF_IP|'$PCRF_IP'|g' install/etc/freeDiameter/smf.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/smf.conf +sed -i 's|LD_LIBRARY_PATH|'$LD_LIBRARY_PATH'|g' install/etc/freeDiameter/smf.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/make_certs.sh # Generate TLS certificates