Fixed issue with docker compose when no DYNAMO_HOME variable is defined.

defold · Oct 15, 2024 · 34953dc · 34953dc
1 parent 0e51936
commit 34953dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/build.gradle b/server/build.gradle
@@ -55,7 +55,7 @@ dependencies {
     }
 
     implementation('com.google.cloud:spring-cloud-gcp-starter-storage')
-    implementation("com.google.cloud:spring-cloud-gcp-starter-logging")
+    implementation('com.google.cloud:spring-cloud-gcp-starter-logging')
     implementation('com.google.cloud:google-cloud-compute:1.59.0')
     implementation('com.google.guava:guava:33.2.1-jre')
     implementation('com.samskivert:jmustache:1.16')

diff --git a/server/docker/common-services.yml b/server/docker/common-services.yml
@@ -19,7 +19,7 @@ services:
     entrypoint: ["java","-Xmx4g","-XX:MaxDirectMemorySize=2g","-Dorg.eclipse.jetty.server.Request.maxFormKeys=1500","-jar","/app/extender.jar"]
     user: extender
     environment:
-      - ${DYNAMO_HOME:+DYNAMO_HOME=/dynamo_home}
+      - DYNAMO_HOME${DYNAMO_HOME:+=/dynamo_home}
       - DM_DEBUG_COMMANDS
       - DM_DEBUG_DISABLE_PROGUARD
       - DM_DEBUG_JOB_FOLDER