From d56d2eb961604afab66c33b8bb2e38195e3825f7 Mon Sep 17 00:00:00 2001 From: Bocki Date: Mon, 29 Mar 2021 10:58:34 +0200 Subject: [PATCH] Added internal port functionality #68 --- .gitlab-ci.yml | 2 +- CHANGELOG.md | 2 ++ root/etc/services.d/deemix/run | 12 +++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f67aa1..8740414 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,4 +34,4 @@ build: # Push manifest to official registry - docker manifest push "$IMAGE:${IMAGE_TAG}" # Validate multi-arch manifest - - docker run --rm mplatform/mquery:v0.2 $IMAGE:${IMAGE_TAG} \ No newline at end of file + - docker run --rm mplatform/mquery $IMAGE:${IMAGE_TAG} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bb156f..f70ac08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # Changelog +## 2021-03-29 +- Added internal port functionality, see #68 ## 2021-03-03 - Fixed #58 - Upgraded Alpine version from 3.12 to 3.13 diff --git a/root/etc/services.d/deemix/run b/root/etc/services.d/deemix/run index 1d9099b..37833d0 100644 --- a/root/etc/services.d/deemix/run +++ b/root/etc/services.d/deemix/run @@ -7,12 +7,18 @@ cd /deemix HOME=/deem +if [ ! -z ${INTPORT} ]; then + port=$INTPORT +else + port=6595 +fi + if [ -f "/config/.arl" ]; then echo "[services.d] Starting with ARL" exec \ - s6-setuidgid abc python3 /deemix/server.py 6595 --serverwide-arl --host 0.0.0.0 + s6-setuidgid abc python3 /deemix/server.py $port --serverwide-arl --host 0.0.0.0 else echo "[services.d] Starting without ARL" exec \ - s6-setuidgid abc python3 /deemix/server.py 6595 --host 0.0.0.0 -fi \ No newline at end of file + s6-setuidgid abc python3 /deemix/server.py $port --host 0.0.0.0 +fi