From ae61b2fbba50f310b95f9a555805155515615a6b Mon Sep 17 00:00:00 2001
From: Robert Adams <misterblue@misterblue.com>
Date: Mon, 18 Aug 2025 12:18:24 -0700
Subject: [PATCH] image-ngc: fix docker-compose filename problems in 'env'
 image-opensim-webrtc: extend ports to a range in docker-compose.yml
 image-opensim-webrtc: change repo from opensimulator.org to github.com
 image-opensim-webrtc: update docker image tag to OSVERSION-OS_GITCOMMIT since
 OS_GIT_DESCRIBE isn't useful image-opensim: comment out Include-Storage in
 GridCommon.ini so it can be overridden in Final.ini Bump VERSION

---
 VERSION.txt                                               | 2 +-
 image-ngc/stop-opensim.sh                                 | 4 ++--
 image-opensim-webrtc/docker-compose.yml                   | 4 ++--
 image-opensim-webrtc/env                                  | 3 ++-
 image-opensim-webrtc/pushOpenSimImage.sh                  | 5 ++++-
 image-opensim/config-osgrid/config-include/GridCommon.ini | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index af253c1..5188cc0 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-4.0.15
+4.0.16
diff --git a/image-ngc/stop-opensim.sh b/image-ngc/stop-opensim.sh
index 2a08dcb..f4f5d14 100755
--- a/image-ngc/stop-opensim.sh
+++ b/image-ngc/stop-opensim.sh
@@ -9,10 +9,10 @@ source ./env
 
 export OS_CONFIG=${OS_CONFIG:-standalone}
 
-echo "Stopping configuration $OS_CONFIG from docker compose.sh"
+echo "Stopping configuration $OS_CONFIG from docker-compose.yml"
 
 docker compose \
-    --file docker compose.yml \
+    --file docker-compose.yml \
     --env-file ./env \
     --project-name opensim-${OS_CONFIG} \
     down
diff --git a/image-opensim-webrtc/docker-compose.yml b/image-opensim-webrtc/docker-compose.yml
index 515c878..91c396c 100644
--- a/image-opensim-webrtc/docker-compose.yml
+++ b/image-opensim-webrtc/docker-compose.yml
@@ -41,7 +41,7 @@ services:
             - 9000:9000/udp
             - 9010:9010/tcp
             - 9010:9010/udp
-            - 9050:9050/tcp
-            - 9050:9050/udp
+            - 9050-9059:9050-9059/tcp
+            - 9050-9059:9050-9059/udp
 
         restart: unless-stopped
diff --git a/image-opensim-webrtc/env b/image-opensim-webrtc/env
index 20188e2..5ac7954 100644
--- a/image-opensim-webrtc/env
+++ b/image-opensim-webrtc/env
@@ -9,7 +9,8 @@
 #    assignment file and a docker-compose env-file
 
 # The sources to build
-OS_GIT_REPO=git://opensimulator.org/git/opensim
+#OS_GIT_REPO=git://opensimulator.org/git/opensim
+OS_GIT_REPO=git://github.com/opensim/opensim.git
 OS_GIT_BRANCH=master
 # OS_GIT_BRANCH=opensim-rel-0.9.3.8940
 OS_BUILDTARGET=Release
diff --git a/image-opensim-webrtc/pushOpenSimImage.sh b/image-opensim-webrtc/pushOpenSimImage.sh
index 50ae994..3d93f02 100755
--- a/image-opensim-webrtc/pushOpenSimImage.sh
+++ b/image-opensim-webrtc/pushOpenSimImage.sh
@@ -8,7 +8,10 @@ export IMAGE_OWNER=${IMAGE_OWNER:-misterblue}
 export IMAGE_NAME=${IMAGE_NAME:-opensim-webrtc}
 export IMAGE_VERSION=${IMAGE_VERSION:-latest}
 
-VERSIONLABEL=$(docker run --rm --entrypoint /home/opensim/getVersion.sh ${IMAGE_NAME}:${IMAGE_VERSION} OS_GIT_DESCRIBE)
+#VERSIONLABEL=$(docker run --rm --entrypoint /home/opensim/getVersion.sh ${IMAGE_NAME}:${IMAGE_VERSION} OS_GIT_DESCRIBE)
+OSVERSION=$(docker run --rm --entrypoint /home/opensim/getVersion.sh ${IMAGE_NAME}:${IMAGE_VERSION} OS_VERSION)
+OSGITCOMMIT=$(docker run --rm --entrypoint /home/opensim/getVersion.sh ${IMAGE_NAME}:${IMAGE_VERSION} OS_GIT_COMMIT_SHORT)
+VERSIONLABEL=${OSVERSION}-${OSGITCOMMIT}
 
 echo "Pushing docker image for opensim version ${VERSIONLABEL}"
 
diff --git a/image-opensim/config-osgrid/config-include/GridCommon.ini b/image-opensim/config-osgrid/config-include/GridCommon.ini
index 1aa8cd8..20959ca 100644
--- a/image-opensim/config-osgrid/config-include/GridCommon.ini
+++ b/image-opensim/config-osgrid/config-include/GridCommon.ini
@@ -6,7 +6,7 @@
     ;
 
     ; SQLite
-    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+    ; Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
     ; MySQL
     ; Uncomment these lines if you want to use MySQL storage