pespin submitted this change.

View Change


Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved
Introduce osmo-epdg-master

Related: OS#6204
Change-Id: Iefc43ffa47f443f2826b8979d4dd0c5542dda1c5
---
M jenkins-common.sh
M make/Makefile
A osmo-epdg-master/Dockerfile
A osmo-epdg-master/Makefile
A osmo-epdg-master/osmo-epdg.config
5 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/jenkins-common.sh b/jenkins-common.sh
index c9299df..4e476f6 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -22,6 +22,7 @@
osmo-*-centos8) echo "centos8-build" ;;
osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;;
osmo_dia2gsup-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;;
+ osmo-epdg-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;;
osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;;
open5gs-master) echo "debian-$DEBIAN_DEFAULT-build" ;;
ttcn3-*) echo "debian-bookworm-titan" ;;
diff --git a/make/Makefile b/make/Makefile
index f007f2a..7266662 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -24,6 +24,7 @@
OSMO_BTS_BRANCH?=master
OSMO_CBC_BRANCH?=master
OSMO_DIA2GSUP_BRANCH?=master
+OSMO_EPDG_BRANCH?=master
OSMO_GBPROXY_BRANCH?=master
OSMO_GGSN_BRANCH?=master
OSMO_GSM_TESTER_BRANCH?=master
@@ -105,6 +106,7 @@
--build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \
--build-arg OSMO_CBC_BRANCH=$(OSMO_CBC_BRANCH) \
--build-arg OSMO_DIA2GSUP_BRANCH=$(OSMO_DIA2GSUP_BRANCH) \
+ --build-arg OSMO_EPDG_BRANCH=$(OSMO_EPDG_BRANCH) \
--build-arg OSMO_GBPROXY_BRANCH=$(OSMO_GBPROXY_BRANCH) \
--build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \
--build-arg OSMO_GSM_TESTER_BRANCH=$(OSMO_GSM_TESTER_BRANCH) \
diff --git a/osmo-epdg-master/Dockerfile b/osmo-epdg-master/Dockerfile
new file mode 100644
index 0000000..58ccf9a
--- /dev/null
+++ b/osmo-epdg-master/Dockerfile
@@ -0,0 +1,28 @@
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-erlang
+# Arguments used after FROM must be specified again
+ARG DISTRO
+
+WORKDIR /tmp
+
+ARG OSMO_EPDG_BRANCH="master"
+
+RUN git clone https://gerrit.osmocom.org/erlang/osmo-epdg.git
+ADD https://gerrit.osmocom.org/plugins/gitiles/erlang/osmo-epdg/+/$OSMO_EPDG_BRANCH?format=TEXT /tmp/commit-osmo-epdg
+
+RUN cd osmo-epdg && \
+ git fetch && git checkout $OSMO_EPDG_BRANCH && \
+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_EPDG_BRANCH || exit 1); \
+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
+ rebar3 compile && \
+ rebar3 escriptize
+
+VOLUME /data
+
+COPY osmo-epdg.config /data/osmo-epdg.config
+
+WORKDIR /data
+CMD ["/bin/sh", "-c", "ERL_FLAGS='-config /data/osmo-epdg.config' /tmp/osmo-epdg/_build/default/bin/osmo-epdg > /data/osmo-epdg.log 2>&1"]
+
+#EXPOSE
diff --git a/osmo-epdg-master/Makefile b/osmo-epdg-master/Makefile
new file mode 100644
index 0000000..8d0e10b
--- /dev/null
+++ b/osmo-epdg-master/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/osmo-epdg-master/osmo-epdg.config b/osmo-epdg-master/osmo-epdg.config
new file mode 100644
index 0000000..be49216
--- /dev/null
+++ b/osmo-epdg-master/osmo-epdg.config
@@ -0,0 +1,2 @@
+[{osmo_epdg, [
+]}].

To view, visit change 34797. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Iefc43ffa47f443f2826b8979d4dd0c5542dda1c5
Gerrit-Change-Number: 34797
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged