hopefully fixed bitnami issue in Dcoker Compose as well

Author: arcuri82

dockerfiles/reservations-api.yaml

@@ -33,12 +33,11 @@ services:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
   db:
-    image: bitnami/mongodb:4.4
+    image: mongo:4.4
     tmpfs:
-      - '/bitnami/mongodb'
-    environment:
-      MONGODB_REPLICA_SET_MODE: primary
-      ALLOW_EMPTY_PASSWORD: yes
+      - '/data/db'
     volumes:
+      - ../scripts/dockerize/data/additional_files/reservations-api/mongo-init.js:/docker-entrypoint-initdb.d/01-init-replica.js
       - ../scripts/dockerize/data/additional_files/reservations-api/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh
-      - ../scripts/dockerize/data/additional_files/reservations-api/init.json:/fixtures/init.json
+      - ../scripts/dockerize/data/additional_files/reservations-api/init.json:/fixtures/init.json
+    command: mongod --replSet rs0 --bind_ip_all

scripts/createDockerFiles.py

@@ -2,14 +2,19 @@
 
 import os
 import pandas as pd
+import shutil
 
 SCRIPT_LOCATION = os.path.dirname(os.path.realpath(__file__))
 SUTS_LOCATION = os.path.join(SCRIPT_LOCATION, 'dockerize/data/sut.csv')
 GENERATOR_LOCATION = os.path.join(SCRIPT_LOCATION, 'dockerize/docker_generator.py')
 
+PYTHON_CMD = shutil.which('python3') or shutil.which('python')
+if not PYTHON_CMD:
+    raise EnvironmentError("Could not find Python interpreter")
+
 suts = pd.read_csv(SUTS_LOCATION)
 dockerized_suts = suts[suts['Dockerized'] == True]
 EXPOSE_PORT = 8080
 
 for _, sut in dockerized_suts.iterrows():
-    os.system(f"python {GENERATOR_LOCATION} {sut['NAME']} {EXPOSE_PORT}")
+    os.system(f"{PYTHON_CMD} {GENERATOR_LOCATION} {sut['NAME']} {EXPOSE_PORT}")

scripts/dockerize/data/additional_files/reservations-api/mongo-init.js

@@ -0,0 +1,6 @@
+rs.initiate({
+    _id: "rs0",
+    members: [
+        { _id: 0, host: "localhost:27017" }
+    ]
+})

scripts/dockerize/data/additional_files/reservations-api/mongo_import.sh

@@ -1,2 +1,21 @@
 #!/bin/bash
-mongoimport --host db --port 27017 --db reservations-api --collection users --file /fixtures/init.json --jsonArray
+
+
+MAX_ATTEMPTS=30
+attempt=1
+
+echo "Waiting for Mongo PRIMARY..."
+
+while ! mongo --host localhost --eval "rs.isMaster().ismaster" | grep -q true; do
+  if [ $attempt -ge $MAX_ATTEMPTS ]; then
+    echo "Mongo PRIMARY did not become ready after $MAX_ATTEMPTS attempts, exiting."
+    exit 1
+  fi
+  attempt=$((attempt+1))
+  sleep 1
+done
+
+echo "Mongo PRIMARY is ready, running import..."
+
+#mongoimport --host db --port 27017 --db reservations-api --collection users --file /fixtures/init.json --jsonArray
+mongoimport --host localhost --port 27017 --db reservations-api --collection users --file /fixtures/init.json --jsonArray

scripts/dockerize/data/sut.csv

@@ -3,7 +3,7 @@ familie-ba-sak,TRUE,-DAZUREAD_TOKEN_ENDPOINT_URL=http://fake-azure-token-endpoin
 pay-publicapi,TRUE,-Ddw.server.applicationConnectors[0].port=8080 -Ddw.server.adminConnectors[0].port=0 -Ddw.redis.endpoint=db:6379,server em_config.yaml,http://localhost:8080/assets/swagger.json,http://localhost:8080,TRUE,FALSE,"","[{""image_name"": ""redis:7.2.3"", ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
 session-service,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6.0"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
 bibliothek,TRUE,"",--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.storagePath=./tmp/bibliothek/,http://localhost:8080/openapi,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
-reservations-api,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.jwt.secret=abcdef012345678901234567890123456789abcdef012345678901234567890123456789,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""bitnami/mongodb:4.4"", ""tmp_fs"": ""/bitnami/mongodb"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/reservations-api/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/reservations-api/init.json:/fixtures/init.json"", ""health_check_command"": """"}]"
+reservations-api,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.jwt.secret=abcdef012345678901234567890123456789abcdef012345678901234567890123456789,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:4.4"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""command"": ""mongod --replSet rs0 --bind_ip_all"", ""volume"": ""../scripts/dockerize/data/additional_files/reservations-api/mongo-init.js:/docker-entrypoint-initdb.d/01-init-replica.js;../scripts/dockerize/data/additional_files/reservations-api/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/reservations-api/init.json:/fixtures/init.json"", ""health_check_command"": """"}]"
 catwatch,TRUE,-Dserver.port=8080 -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password,"",http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"",
 cwa-verification,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.datasource.driver-class-name=org.h2.Driver -Dspring.datasource.username=sa -Dspring.datasource.password,"--server.port=8080 --spring.profiles.active=local,external,internal --management.server.port=-1 --server.ssl.enabled=false --cwa-testresult-server.url=http://cwa-testresult-server:8088",http://localhost:8080/api-docs.json,http://localhost:8080,FALSE,FALSE,"",
 features-service,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password,--server.port=8080,http://localhost:8080/swagger.json,http://localhost:8080,FALSE,FALSE,"",