admin/opensim-docker
1
0
Fork 0
mirror of https://github.com/Misterblue/opensim-docker.git synced 2026-07-30 11:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MARIADB_ROOT_PASSWORD for MariaDB initialization

Browse Source 
Update run-opensim.sh to load os-secrets for DB initialization.
Rename OS_BRANCH to OS_GIT_BRANCH
Rename OS_REPO to OS_GIT_REPO
Eliminate OPENSIM_USER and OPENSIM_USER_PASSWORD from os-secrets as they are not used.
This commit is contained in:
Robert Adams
2024-08-13 22:15:07 +00:00
parent 4895e7417d
commit cfcde0ceb4
19 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image-ncg/Dockerfile-ncg
+5 -5
View File
@@ -16,8 +16,8 @@ ARG VERSIONDIR=/home/opensim/VERSION
ARG OS_ACCOUNT=opensim
# Arguments for fetching the proper version of OpenSimulator
ARG OS_REPO=https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git
ARG OS_BRANCH=develop
ARG OS_GIT_REPO=https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git
ARG OS_GIT_BRANCH=develop
ARG OS_BUILDTARGET=Release
ARG OS_SLN=OpenSim.sln
@@ -57,12 +57,12 @@ RUN mkdir -p $VERSIONDIR \
# Fetch the latest version of the NCG sources.
RUN cd $OPENSIMHOME \
&& git clone --depth=1 -b $OS_BRANCH --single-branch $OS_REPO opensim
&& git clone --depth=1 -b $OS_GIT_BRANCH --single-branch $OS_GIT_REPO opensim
# Extract version information from the fetched sources
RUN cd $OPENSIMDIR \
&& echo $OS_REPO > "$VERSIONDIR/OS_GIT_REPO" \
&& echo $OS_BRANCH > "$VERSIONDIR/OS_GIT_BRANCH" \
&& echo $OS_GIT_REPO > "$VERSIONDIR/OS_GIT_REPO" \
&& echo $OS_GIT_BRANCH > "$VERSIONDIR/OS_GIT_BRANCH" \
&& echo $OS_BUILDTARGET > "$VERSIONDIR/OS_BUILD_TARGET" \
&& git describe --tags --long --always > "$VERSIONDIR/OS_GIT_DESCRIBE" \
&& git rev-parse HEAD > "$VERSIONDIR/OS_GIT_COMMIT" \
image-ncg/build-ncg.sh
+2 -2
View File
@@ -26,8 +26,8 @@ docker build \
--build-arg OS_DOCKER_GIT_BRANCH=$OS_DOCKER_GIT_BRANCH \
--build-arg OS_DOCKER_GIT_COMMIT=$OS_DOCKER_GIT_COMMIT \
--build-arg OS_DOCKER_GIT_COMMIT_SHORT=$OS_DOCKER_GIT_COMMIT_SHORT \
--build-arg OS_REPO=$OS_REPO \
--build-arg OS_BRANCH=$OS_BRANCH \
--build-arg OS_GIT_REPO=$OS_GIT_REPO \
--build-arg OS_GIT_BRANCH=$OS_GIT_BRANCH \
--build-arg OS_BUILDTARGET=$OS_BUILDTARGET \
--build-arg OS_SLN=$OS_SLN \
-t "$IMAGE_NAME" \
image-ncg/config-standalone/os-secrets
+1 -2
View File
@@ -17,13 +17,12 @@
# If this next variable is defined, MYSQL is configured
export MYSQL_ROOT_PASSWORD=unknownStuff
export MARIADB_ROOT_PASSWORD=unknownStuff
export MYSQL_DB_HOST=dbservice
export MYSQL_DB_DB=opensim
export MYSQL_DB_USER=opensim
export MYSQL_DB_USER_PW=moreUnknownStuff
export OPENSIM_USER=opensim
# The following are used to initialize estate if running standalone
export DEFAULT_ESTATE_NAME="MyEstate"
export DEFAULT_ESTATE_OWNER="Donald Duck"
image-ncg/docker-compose.yml
+1
View File
@@ -11,6 +11,7 @@ services:
image: mariadb:latest
environment:
MYSQL_ROOT_PASSWORD:
MARIADB_ROOT_PASSWORD:
# Parameters added to invocation.
# Default is to flush after every operation which slows Docker image down.
# This flushes log once a second.
image-ncg/env
+4 -4
View File
@@ -9,10 +9,10 @@
# assignment file and a docker-compose env-file
# The sources to build
OS_REPO=https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git
# OS_BRANCH=develop
# OS_BRANCH=opensim-rel-0.9.3.8940
OS_BRANCH=opensim-rel-0.9.3.8984
OS_GIT_REPO=https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git
# OS_GIT_BRANCH=develop
# OS_GIT_BRANCH=opensim-rel-0.9.3.8940
OS_GIT_BRANCH=opensim-rel-0.9.3.8984
OS_BUILDTARGET=Release
OS_SLN=OpenSim.sln
image-ncg/run-opensim.sh
+9
View File
@@ -14,7 +14,14 @@ BASE=$(pwd)
# source ./envToEnvironment.sh
source ./env
# The selects the configuration to mount and use in the Docker image
export OS_CONFIG=${OS_CONFIG:-standalone}
echo "Using configuration \"$OS_CONFIG\""
# Get the secrets for the environment
# (the following 'export' fakes out 'setEnvironment' to use the local directory
export OPENSIMCONFIG=${BASE}/config-${OS_CONFIG}
source ${OPENSIMCONFIG}/scripts/setEnvironment.sh
# Local directory for storage of sql persistant data (so region
# contents persists between container restarts).
@@ -25,6 +32,8 @@ if [[ ! -d "$HOME/opensim-sql-data" ]] ; then
chmod o+w "$HOME/opensim-sql-data"
fi
cd "${BASE}"
# https://docs.docker.com/engine/security/userns-remap/
# --userns-remap="opensim:opensim"
docker-compose \
image-opensim-herbal3d/Dockerfile-herbal3d
+3 -3
View File
@@ -18,8 +18,8 @@ ARG OS_DOCKER_GIT_COMMIT
ARG OS_DOCKER_GIT_COMMIT_SHORT
# Arguments for fetching OpenSimulator
ARG OS_REPO=git://opensimulator.org/git/opensim
ARG OS_BRANCH=dotnet6
ARG OS_GIT_REPO=git://opensimulator.org/git/opensim
ARG OS_GIT_BRANCH=dotnet6
# Each of the different packages can have their branch over-ridden with a --build-arg
ARG COMMON_ENTITIES_BRANCH=dotnet6
@@ -66,7 +66,7 @@ RUN mkdir -p $VERSIONDIR \
# Fetch the latest version of the OpenSimulator sources.
RUN cd /home/opensim \
&& git clone --depth=1 -b $OS_BRANCH --single-branch $OS_REPO opensim
&& git clone --depth=1 -b $OS_GIT_BRANCH --single-branch $OS_GIT_REPO opensim
RUN cd $OPENSIMDIR/addon-modules/ \
&& git clone --depth=1 -b $COMMON_ENTITIES_BRANCH --single-branch https://github.com/Herbal3d/HerbalCommonEntitiesCS.git
image-opensim-herbal3d/build-herbal3d.sh
+1 -1
View File
@@ -15,7 +15,7 @@ cp -r ../run-scripts temp-run-scripts
# Note that the '--no-cache' can be added force refetching of the OpenSimulator git sources
# --no-cache
# As of 20220320, the Prebuild needed for Herbal3d is in a branch (setting of OS_BRANCH)
# As of 20220320, the Prebuild needed for Herbal3d is in a branch (setting of OS_GIT_BRANCH)
docker build \
--build-arg BUILD_DATE=$BUILD_DATE \
--build-arg BUILD_DAY=$BUILD_DAY \
image-opensim-herbal3d/config/config-basilalpha/os-secrets
+1 -4
View File
@@ -16,16 +16,13 @@
# ccrypt -d -E "CONFIGKEY" < os-secrets.crypt
# If this next variable is defined, MYSQL is configured
export MYSQL_ROOT_ACCOUNT=root
export MYSQL_ROOT_PASSWORD=NotFoundAnywhere
export MARIADB_ROOT_PASSWORD=NotFoundAnywhere
export MYSQL_DB_SOURCE=dbservice
export MYSQL_DB_DB=opensim
export MYSQL_DB_USER=opensim
export MYSQL_DB_USER_PASSWORD=StuffAndNonsense
export OPENSIM_USER=opensim
export OPENSIM_USER_PASSWORD=unknownPassword
# The following are used to initialize estate if running standalone
export DEFAULT_ESTATE_NAME="Basil Estate"
export DEFAULT_ESTATE_OWNER="Donald Duck"
image-opensim-herbal3d/config/config-standalone/os-secrets
+1 -3
View File
@@ -17,14 +17,12 @@
# If this next variable is defined, MYSQL is configured
#export MYSQL_ROOT_PASSWORD=unknownStuff
#export MARIADB_ROOT_PASSWORD=unknownStuff
export MYSQL_DB_SOURCE=localhost
export MYSQL_DB_DB=opensim
export MYSQL_DB_USER=opensim
export MYSQL_DB_USER_PASSWORD=dbpassword
export OPENSIM_USER=opensim
export OPENSIM_USER_PASSWORD=unknownPassword
# The following are used to initialize estate if running standalone
export DEFAULT_ESTATE_NAME="Donalds Estate"
export DEFAULT_ESTATE_OWNER="Donald Duck"
image-opensim/Dockerfile-opensim
+5 -5
View File
@@ -16,8 +16,8 @@ ARG VERSIONDIR=/home/opensim/VERSION
ARG OS_ACCOUNT=opensim
# Arguments for fetching the proper version of OpenSimulator
ARG OS_REPO=git://opensimulator.org/git/opensim
ARG OS_BRANCH=mster
ARG OS_GIT_REPO=git://opensimulator.org/git/opensim
ARG OS_GIT_BRANCH=master
ARG OS_BUILDTARGET=Release
ARG OS_SLN=OpenSim.sln
@@ -57,12 +57,12 @@ RUN mkdir -p $VERSIONDIR \
# Fetch the latest version of the OpenSimulator sources.
RUN cd $OPENSIMHOME \
&& git clone --depth=1 -b $OS_BRANCH --single-branch $OS_REPO opensim
&& git clone --depth=1 -b $OS_GIT_BRANCH --single-branch $OS_GIT_REPO opensim
# Extract version information from the fetched sources
RUN cd $OPENSIMDIR \
&& echo $OS_REPO > "$VERSIONDIR/OS_GIT_REPO" \
&& echo $OS_BRANCH > "$VERSIONDIR/OS_GIT_BRANCH" \
&& echo $OS_GIT_REPO > "$VERSIONDIR/OS_GIT_REPO" \
&& echo $OS_GIT_BRANCH > "$VERSIONDIR/OS_GIT_BRANCH" \
&& echo $OS_BUILDTARGET > "$VERSIONDIR/OS_BUILD_TARGET" \
&& git describe --tags --long --always > "$VERSIONDIR/OS_GIT_DESCRIBE" \
&& git rev-parse HEAD > "$VERSIONDIR/OS_GIT_COMMIT" \
image-opensim/build-opensim.sh
+2 -2
View File
@@ -26,8 +26,8 @@ docker build \
--build-arg OS_DOCKER_GIT_BRANCH=$OS_DOCKER_GIT_BRANCH \
--build-arg OS_DOCKER_GIT_COMMIT=$OS_DOCKER_GIT_COMMIT \
--build-arg OS_DOCKER_GIT_COMMIT_SHORT=$OS_DOCKER_GIT_COMMIT_SHORT \
--build-arg OS_REPO=$OS_REPO \
--build-arg OS_BRANCH=$OS_BRANCH \
--build-arg OS_GIT_REPO=$OS_GIT_REPO \
--build-arg OS_GIT_BRANCH=$OS_GIT_BRANCH \
--build-arg OS_BUILDTARGET=$OS_BUILDTARGET \
--build-arg OS_SLN=$OS_SLN \
-t "$IMAGE_NAME" \
image-opensim/config-osgrid/os-secrets
+1 -2
View File
@@ -17,13 +17,12 @@
# If this next variable is defined, MYSQL is configured
export MYSQL_ROOT_PASSWORD=unknownStuff
export MARIADB_ROOT_PASSWORD=unknownStuff
export MYSQL_DB_HOST=dbservice
export MYSQL_DB_DB=opensim
export MYSQL_DB_USER=opensim
export MYSQL_DB_USER_PW=moreUnknownStuff
export OPENSIM_USER=opensim
# The following are used to initialize estate if running standalone
export DEFAULT_ESTATE_NAME="MyEstate"
export DEFAULT_ESTATE_OWNER="Donald Duck"
image-opensim/config-standalone/os-secrets
+1 -2
View File
@@ -17,13 +17,12 @@
# If this next variable is defined, MYSQL is configured
export MYSQL_ROOT_PASSWORD=unknownStuff
export MARIADB_ROOT_PASSWORD=unknownStuff
export MYSQL_DB_HOST=dbservice
export MYSQL_DB_DB=opensim
export MYSQL_DB_USER=opensim
export MYSQL_DB_USER_PW=moreUnknownStuff
export OPENSIM_USER=opensim
# The following are used to initialize estate if running standalone
export DEFAULT_ESTATE_NAME="MyEstate"
export DEFAULT_ESTATE_OWNER="Donald Duck"
image-opensim/docker-compose.yml
+1
View File
@@ -11,6 +11,7 @@ services:
image: mariadb:latest
environment:
MYSQL_ROOT_PASSWORD:
MARIADB_ROOT_PASSWORD:
# Parameters added to invocation.
# Default is to flush after every operation which slows Docker image down.
# This flushes log once a second.
image-opensim/env
+3 -3
View File
@@ -9,9 +9,9 @@
# assignment file and a docker-compose env-file
# The sources to build
OS_REPO=git://opensimulator.org/git/opensim
OS_BRANCH=master
# OS_BRANCH=opensim-rel-0.9.3.8940
OS_GIT_REPO=git://opensimulator.org/git/opensim
OS_GIT_BRANCH=master
# OS_GIT_BRANCH=opensim-rel-0.9.3.8940
OS_BUILDTARGET=Release
OS_SLN=OpenSim.sln
image-opensim/run-opensim.sh
+8
View File
@@ -14,9 +14,15 @@ BASE=$(pwd)
# source ./envToEnvironment.sh
source ./env
# The selects the configuration to mount and use in the Docker image
export OS_CONFIG=${OS_CONFIG:-standalone}
echo "Using configuration \"$OS_CONFIG\""
# Get the secrets for the environment
# (the following 'export' fakes out 'setEnvironment' to use the local directory
export OPENSIMCONFIG=${BASE}/config-${OS_CONFIG}
source ${OPENSIMCONFIG}/scripts/setEnvironment.sh
# Local directory for storage of sql persistant data (so region
# contents persists between container restarts).
# This must be the same directory as in $COMPOSEFILE
@@ -26,6 +32,8 @@ if [[ ! -d "$HOME/opensim-sql-data" ]] ; then
chmod o+w "$HOME/opensim-sql-data"
fi
cd "${BASE}"
# https://docs.docker.com/engine/security/userns-remap/
# --userns-remap="opensim:opensim"
docker-compose \
run-scripts/bootOpenSim.sh
+1 -1
View File
@@ -15,7 +15,7 @@ export OPENSIMCONFIG=$OPENSIMBIN/config
# Start Opensim
echo "Starting OpenSimulator version $(cat $VERSIONDIR/OS_VERSION)"
echo " built from branch $(cat $VERSIONDIR/OS_BRANCH)"
echo " built from branch $(cat $VERSIONDIR/OS_GIT_BRANCH)"
echo " with opensim-docker version $(cat $VERSIONDIR/OS_DOCKER_IMAGE_VERSION)"
echo " using configuration set \"$OS_CONFIG\""
run-scripts/getVersion.sh
+1 -1
View File
@@ -17,7 +17,7 @@ for valueName in * ; do
done
if [[ -z "$part" ]] ; then
echo "${OS_VERSION}-${OS_BRANCH}-${OS_GIT_COMMIT_SHORT}-${BUILD_DATE}/${OS_DOCKER_IMAGE_VERSION}"
echo "${OS_VERSION}-${OS_GIT_BRANCH}-${OS_GIT_COMMIT_SHORT}-${BUILD_DATE}/${OS_DOCKER_IMAGE_VERSION}"
else
cat ${VERSIONDIR}/$part
fi