fix: apply the mongo settings properly obiba/docker-mica#10

obiba · May 8, 2024 · 840c926 · 840c926
1 parent 2f6fac4
commit 840c926
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,12 @@
 Docker Agate
 ============
 
+See [Agate docker image documentation](https://agatedoc.obiba.org/en/latest/admin/installation.html#docker-image-installation).
+
 Use [docker compose](https://docs.docker.com/compose/) to launch agate and mongodb applications:
 
 ```
-docker-compose up
+docker compose up
 ```
 
 Then connect to:

diff --git a/bin/first_run.sh b/bin/first_run.sh
@@ -16,19 +16,25 @@ cat $AGATE_HOME/conf/shiro.ini | sed -e "s,^administrator\s*=.*\,,administrator=
     mv /tmp/shiro.ini $AGATE_HOME/conf/shiro.ini
 
 # Configure MongoDB
-if [ -n "$MONGO_DB" ]
-	then
-	sed s,localhost:27017/agate,localhost:27017/$MONGO_DB,g $AGATE_HOME/conf/application.yml > /tmp/application.yml
+if [ -n "$MONGODB_URI" ]
+then
+	sed s,localhost:27017/agate,$MONGODB_URI,g $AGATE_HOME/conf/application.yml > /tmp/application.yml
 	mv -f /tmp/application.yml $AGATE_HOME/conf/application.yml
-fi
-if [ -n "$MONGO_HOST" ]
+elif [ -n "$MONGO_HOST" ]
 	then
-	MGP=27017
+  MGP=27017
 	if [ -n "$MONGO_PORT" ]
-		then
+	then
 		MGP=$MONGO_PORT
 	fi
-	sed s/localhost:27017/$MONGO_HOST:$MGP/g $AGATE_HOME/conf/application.yml > /tmp/application.yml
+	MGURI="$MONGO_HOST:$MGP"
+	if [ -n "$MONGO_USER" ] && [ -n "$MONGO_PASSWORD" ]
+	then
+		MGURI="$MONGO_USER:$MONGO_PASSWORD@$MGURI/$MONGO_DB?authSource=admin"
+	else
+		MGURI="$MGURI/$MONGO_DB"
+	fi
+	sed s,localhost:27017/agate,$MGURI,g $AGATE_HOME/conf/application.yml > /tmp/application.yml
 	mv -f /tmp/application.yml $AGATE_HOME/conf/application.yml
 fi
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
         agate:
                 image: obiba/agate
@@ -10,9 +9,15 @@ services:
                         - AGATE_ADMINISTRATOR_PASSWORD=password
                         - MONGO_HOST=mongo
                         - MONGO_PORT=27017
+                        - MONGO_DB=agate
+                        - MONGO_USER=${MONGO_USER:-obiba}
+                        - MONGO_PASSWORD=${MONGO_PASSWORD:-password}
                         - RECAPTCHA_SITE_KEY=6Lfo7gYTAAAAAOyl8_MHuH-AVBzRDtpIuJrjL3Pb
                         - RECAPTCHA_SECRET_KEY=6Lfo7gYTAAAAADym-vSDvPBeBCXaxIprA0QXLk_b
                 volumes:
                         - /tmp/agate:/srv
         mongo:
                 image: mongo:6.0
+                environment:
+                        - MONGO_INITDB_ROOT_USERNAME=${MONGO_USER:-obiba}
+                        - MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD:-password}