docker changes

docker/docker-compose-mysql.yaml

@@ -4,7 +4,8 @@ services:
 
   conductor-server:
     environment:
-      - CONFIG_PROP=config-mysql-grpc.properties
+      - conductor.db.type=redis_standalone
+      - conductor.redis.hosts=rs:6379:us-east-1c
     image: conductor:server
     build:
       context: ..

docker/docker-compose.yaml

@@ -3,7 +3,7 @@ version: '2.3'
 services:
   conductor-server:
     environment:
-      - CONFIG_PROP=config-local.properties
+      -
     image: conductor:server
     container_name: conductor-server
     build:

docker/server/DockerfileLocal

@@ -19,7 +19,8 @@ RUN apk add --update nodejs npm yarn
 
 COPY . /conductor
 WORKDIR /conductor/ui
-RUN yarn install && yarn build
+#RUN yarn install && yarn build
+RUN mkdir build
 RUN ls -ltr
 RUN echo "Done building UI"
 
@@ -52,7 +53,6 @@ LABEL maintainer="Netflix OSS <conductor@netflix.com>"
 RUN apk add openjdk11
 RUN apk add curl
 RUN apk add nginx
-RUN apk add redis
 RUN apk add postgresql14
 
 # Make app folders
@@ -62,9 +62,7 @@ RUN mkdir -p /app/elasticsearch
 # Copy the compiled output to new image
 COPY docker/server/bin /app
 COPY docker/server/config /app/config
-COPY docker/server/config/redis.conf /app/config/redis.conf
-COPY docker/server/bin/start_all.sh /app/start_all.sh
-COPY docker/server/bin/health.sh /app/health.sh
+COPY docker/server/bin/start_all_local.sh /app/start_all_local.sh
 COPY --from=builder /server-build/conductor-community/community-server/build/libs/*boot*.jar /app/libs/conductor-server.jar
 
 # Copy compiled UI assets to nginx www directory

docker/server/bin/startup.sh

@@ -28,7 +28,7 @@ export config_file=
 
 if [ -z "$CONFIG_PROP" ];
   then
-    echo "Using an in-memory instance of conductor";
+    echo "Using default configuration file";
     export config_file=/app/config/config.properties
   else
     echo "Using '$CONFIG_PROP'";

docker/server/config/config-local-postgres.properties

@@ -1,18 +1,20 @@
+conductor.grpc-server.enabled=false
 # Database persistence type.
 conductor.db.type=postgres
-
-# postgres
-spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+conductor.db.schema=conductor
+conductor.postgres.schema=conductor
+conductor.db.queue.type=postgres
+spring.datasource.url=jdbc:postgresql://localhost:5432/postgres?schema=conductor&ApplicationName=conductor
 spring.datasource.username=postgres
 spring.datasource.password=postgres
-
-# Elastic search instance indexing is enabled.
-conductor.indexing.enabled=true
 conductor.indexing.type=postgres
+conductor.indexing.enabled=true
 
-# Additional modules for metrics collection exposed to Prometheus (optional)
-conductor.metrics-prometheus.enabled=true
-management.endpoints.web.exposure.include=prometheus
-
-# Load sample kitchen sink workflow
-loadSample=true
+# The following is to force Elastic Search IndexDAO not to run. If it just missing it will still try to start v6
+conductor.elasticsearch.version=postgres
+flyway.schema=clo-workflow
+# Hikari pool sizes are -1 by default and prevent startup
+spring.datasource.hikari.maximum-pool-size=10
+spring.datasource.hikari.minimum-idle=2
+# Elastic search instance indexing is enabled.
+#conductor.indexing.enabled=false

docker/server/config/config-redis.properties

@@ -0,0 +1,22 @@
+# Database persistence type.
+# Below are the properties for redis
+conductor.db.type=redis_standalone
+conductor.redis.hosts=rs:6379:us-east-1c
+conductor.redis-lock.serverAddress=redis://rs:6379
+conductor.redis.taskDefCacheRefreshInterval=1
+conductor.redis.workflowNamespacePrefix=conductor
+conductor.redis.queueNamespacePrefix=conductor_queues
+
+# Elastic search instance indexing is enabled.
+conductor.indexing.enabled=true
+
+# Transport address to elasticsearch
+conductor.elasticsearch.url=http://es:9200
+conductor.elasticsearch.indexName=conductor
+
+# Additional modules for metrics collection exposed to Prometheus (optional)
+conductor.metrics-prometheus.enabled=true
+management.endpoints.web.exposure.include=prometheus
+
+# Load sample kitchen sink workflow
+loadSample=true

docker/server/config/config.properties

@@ -1,37 +1,40 @@
-# Database persistence type.
-conductor.db.type=redis_standalone
-conductor.redis.hosts=localhost:6379:us-east-1c
-conductor.redis-lock.serverAddress=redis://localhost:6379
-conductor.redis.taskDefCacheRefreshInterval=1
-conductor.redis.workflowNamespacePrefix=conductor
-conductor.redis.queueNamespacePrefix=conductor_queues
+# See README in the docker for configuration guide
 
+conductor.db.type=SET_THIS
 
-# By default with dynomite, we want the repairservice enabled
-conductor.app.workflowRepairServiceEnabled=true
+# =====================================================#
+#              Redis Configuration Properties
+# =====================================================#
+#conductor.db.type=redis_standalone
 
+# The last part MUST be us-east-1c, it is not used and is kept for backwards compatibility
+# conductor.redis.hosts=rs:6379:us-east-1c
+#
 
-# Elastic search instance indexing is enabled.
-conductor.indexing.enabled=true
+# conductor.redis-lock.serverAddress=redis://rs:6379
+# conductor.redis.taskDefCacheRefreshInterval=1
+# conductor.redis.workflowNamespacePrefix=conductor
+# conductor.redis.queueNamespacePrefix=conductor_queues
 
-# Transport address to elasticsearch
-conductor.elasticsearch.url=http://localhost:9200
 
-# Name of the elasticsearch cluster
-conductor.elasticsearch.indexName=conductor
-#conductor.event-queues.amqp.queueType=classic
-#conductor.event-queues.amqp.sequentialMsgProcessing=true
+# =====================================================#
+#              Postgres Configuration Properties
+# =====================================================#
 
-# Additional modules for metrics collection exposed via logger (optional)
-# conductor.metrics-logger.enabled=true
-# conductor.metrics-logger.reportPeriodSeconds=15
+# conductor.db.type=postgres
+# spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+# spring.datasource.username=postgres
+# spring.datasource.password=postgres
+# Additionally you can use set the spring.datasource.XXX properties for connection pool size etc.
 
-# Additional modules for metrics collection exposed to Prometheus (optional)
-# conductor.metrics-prometheus.enabled=true
-# management.endpoints.web.exposure.include=prometheus
+# If you want to use Postgres as indexing store set the following
+# conductor.indexing.enabled=true
+# conductor.indexing.type=postgres
 
-# To enable Workflow/Task Summary Input/Output JSON Serialization, use the following:
-# conductor.app.summary-input-output-json-serialization.enabled=true
+# When using Elasticsearch 7 for indexing, set the following
+
+# conductor.indexing.enabled=true
+# conductor.elasticsearch.url=http://es:9200
+# conductor.elasticsearch.version=7
+# conductor.elasticsearch.indexName=conductor
 
-# Load sample kitchen sink workflow
-loadSample=true