fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27076 ) Change subject: open5gs-master: ensure consistent install paths with '-latest' ...................................................................... open5gs-master: ensure consistent install paths with '-latest' This allows running TTCN-3 test cases against both '-latest' and '-master' images using the same configuration files. Change-Id: Ib4dcf3a9f77205dcdd0ff4932763e202cb89001c Related: SYS#5602 --- M open5gs-master/Dockerfile M ttcn3-ggsn-test/ogs/freediameter.conf 2 files changed, 16 insertions(+), 10 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved; Verified diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 6579db4..dd6cfd8 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -47,4 +47,10 @@ # build + install open5gs RUN cd $GITHUB_REPO && \ - meson build && ninja -C build install + meson build \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=lib/x86_64-linux-gnu \ + --libexecdir=lib/x86_64-linux-gnu && \ + ninja -C build install diff --git a/ttcn3-ggsn-test/ogs/freediameter.conf b/ttcn3-ggsn-test/ogs/freediameter.conf index 612bd35..214ae2c 100644 --- a/ttcn3-ggsn-test/ogs/freediameter.conf +++ b/ttcn3-ggsn-test/ogs/freediameter.conf @@ -106,7 +106,7 @@ # Default : NO DEFAULT #TLS_Cred = "<x509 certif file.PEM>" , "<x509 private key file.PEM>"; #TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key"; -TLS_Cred = "/usr/local/etc/freeDiameter/smf.cert.pem", "/usr/local/etc/freeDiameter/smf.key.pem"; +TLS_Cred = "/etc/freeDiameter/smf.cert.pem", "/etc/freeDiameter/smf.key.pem"; # Certificate authority / trust anchors # The file containing the list of trusted Certificate Authorities (PEM list) @@ -114,7 +114,7 @@ # The directive can appear several times to specify several files. # Default : GNUTLS default behavior #TLS_CA = "<file.PEM>"; -TLS_CA = "/usr/local/etc/freeDiameter/cacert.pem"; +TLS_CA = "/etc/freeDiameter/cacert.pem"; # Certificate Revocation List file # The information about revoked certificates. @@ -223,13 +223,13 @@ # 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 = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; -LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx"; -LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx"; -LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx"; -LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx"; -LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx"; -LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx"; ############################################################## -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib4dcf3a9f77205dcdd0ff4932763e202cb89001c Gerrit-Change-Number: 27076 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged