OZ-196: Provide explicit env file location in start.sh

scripts/go-to-scripts-dir.sh

@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 
 # Will be substituted at build time by the Maven Resource plugin filtering.
-pushd ${project.build.directory}/${project.artifactId}-${project.version}/scripts
+pushd ${project.build.directory}/${project.artifactId}-${project.version}/scripts/
+echo "Moved to: $PWD"
+echo ""
+echo "(💡 Use 'popd' to move back to the repo root directory)"

scripts/start.sh

@@ -53,10 +53,10 @@ if [[ $INSTALLED_DOCKER_VERSION =~ $MINIMUM_REQUIRED_DOCKER_VERSION_REGEX ]]; th
     # Run Ozone
     ($dockerComposeOzoneCommand)
 
-    # Run the Apache2 Proxy service, if $TRAEFIK!=true
+    # Run the Nginx Proxy service, if $TRAEFIK!=true
     if [ "$TRAEFIK" != "true" ]; then
         dockerComposeProxyCommand="docker compose -p ozone $dockerComposeProxyCLIOptions up -d --build"
-        echo "$INFO Running Apache2 proxy service (\$TRAEFIK!=true)..."
+        echo "$INFO Running Nginx proxy service (\$TRAEFIK!=true)..."
         echo ""
         echo "$dockerComposeProxyCommand"
         echo ""

scripts/utils.sh

@@ -62,19 +62,22 @@ function setDockerComposeCLIOptions () {
         export dockerComposeFilesCLIOptions="$dockerComposeFilesCLIOptions -f ../$file"
     done
 
-    # Use the concatenated.env file if one is provided
+    # Set the default env file
+    export dockerComposeEnvFilePath="../.env"
+
+    # Override the default with the concatenated.env file if it is provided
     concatenatedEnvFilePath="../concatenated.env"
     if [ -f "$concatenatedEnvFilePath" ]; then
-        export dockerComposeEnvFileCLIOption="--env-file $concatenatedEnvFilePath"
+        export dockerComposeEnvFilePath="$concatenatedEnvFilePath"
     fi
 
-    export dockerComposeOzoneCLIOptions="$dockerComposeEnvFileCLIOption $dockerComposeFilesCLIOptions"
+    export dockerComposeOzoneCLIOptions="--env-file $dockerComposeEnvFilePath $dockerComposeFilesCLIOptions"
 
     # Set args for the proxy service
-    export dockerComposeProxyCLIOptions="$dockerComposeEnvFileCLIOption -f ../proxy/docker-compose.yml"
+    export dockerComposeProxyCLIOptions="--env-file $dockerComposeEnvFilePath -f ../proxy/docker-compose.yml"
 
     # Set args for the demo service
-    export dockerComposeDemoCLIOptions="$dockerComposeEnvFileCLIOption -f ../demo/docker-compose.yml"
+    export dockerComposeDemoCLIOptions="--env-file $dockerComposeEnvFilePath -f ../demo/docker-compose.yml"
 }
 
 function setTraefikIP {