fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40769?usp=email )

Change subject: osmo-s1gw-master: align with the upstream ......................................................................

osmo-s1gw-master: align with the upstream

Change-Id: I3c694af378c500002752c208c8fcc040fdac5587 Related: osmo-s1gw.git I5681ca103daf1c497218b4513b0ca97b1aae03d3 Related: SYS#7332 --- M osmo-s1gw-master/Dockerfile 1 file changed, 5 insertions(+), 2 deletions(-)

Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified

diff --git a/osmo-s1gw-master/Dockerfile b/osmo-s1gw-master/Dockerfile index 34028f8..8a4a2f2 100644 --- a/osmo-s1gw-master/Dockerfile +++ b/osmo-s1gw-master/Dockerfile @@ -4,6 +4,9 @@ # Arguments used after FROM must be specified again ARG DISTRO

+# build and run the project as root +USER root + WORKDIR /tmp

ARG OSMO_S1GW_BRANCH="master" @@ -15,10 +18,10 @@ git fetch && git checkout $OSMO_S1GW_BRANCH && \ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_S1GW_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make build + make && make install

VOLUME /data

COPY osmo-s1gw.config /data/osmo-s1gw.config

-CMD ["/bin/sh", "-c", "ERL_FLAGS='-config /data/osmo-s1gw.config' /tmp/osmo-s1gw/_build/default/bin/osmo-s1gw > /data/osmo-s1gw.log 2>&1"] +CMD ["/bin/sh", "-c", "osmo-s1gw -c /data/osmo-s1gw.config > /data/osmo-s1gw.log 2>&1"]