laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27057 )
Change subject: open5gs-master: remove both setup.sh and pgw.sh ......................................................................
open5gs-master: remove both setup.sh and pgw.sh
Having these scripts makes no sense anymore, because:
* setup.sh was moved to ttcn3-pgw-test, * pgw.sh runs non-existing open5gs-pgwd.
Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7 Related: SYS#5602 --- M open5gs-master/Dockerfile D open5gs-master/pgw.sh D open5gs-master/setup.sh 3 files changed, 0 insertions(+), 18 deletions(-)
Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified
diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 141f08a..35385d7 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -47,9 +47,6 @@ net-tools && \ apt-get clean
-COPY setup.sh /root -COPY pgw.sh /root - # crate user ARG username=osmocom RUN useradd -m --uid=1000 ${username} && \ diff --git a/open5gs-master/pgw.sh b/open5gs-master/pgw.sh deleted file mode 100755 index 3286256..0000000 --- a/open5gs-master/pgw.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -e -set -x -/root/setup.sh -su - osmocom -c "open5gs-pgwd $*" diff --git a/open5gs-master/setup.sh b/open5gs-master/setup.sh deleted file mode 100755 index 58693fd..0000000 --- a/open5gs-master/setup.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if ! grep "ogstun" /proc/net/dev > /dev/null; then - ip tuntap add name ogstun mode tun -fi -ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null -ip addr add 10.45.0.1/16 dev ogstun -ip addr del cafe::1/64 dev ogstun 2> /dev/null -ip addr add cafe::1/64 dev ogstun -ip link set ogstun up
-
laforge