From 99f6b7c756f51b5423a501cd01feb2aede96fc7e Mon Sep 17 00:00:00 2001 From: manan164 <1897158+manan164@users.noreply.github.com> Date: Tue, 29 Aug 2023 21:03:52 +0530 Subject: [PATCH] docker builds --- docker/docker-compose-postgres.yaml | 100 ------------------ docker/docker-compose-prometheus.yaml | 20 ---- docker/docker-compose.yaml | 2 +- docker/server/README.md | 4 +- docker/server/config/config-mysql.properties | 25 ----- .../server/config/config-postgres.properties | 25 ----- 6 files changed, 3 insertions(+), 173 deletions(-) delete mode 100644 docker/docker-compose-postgres.yaml delete mode 100644 docker/docker-compose-prometheus.yaml delete mode 100755 docker/server/config/config-mysql.properties delete mode 100755 docker/server/config/config-postgres.properties diff --git a/docker/docker-compose-postgres.yaml b/docker/docker-compose-postgres.yaml deleted file mode 100644 index 1a0787be11..0000000000 --- a/docker/docker-compose-postgres.yaml +++ /dev/null @@ -1,100 +0,0 @@ -version: '2.3' - -services: - conductor-server: - environment: - - CONFIG_PROP=config-postgres.properties - image: conductor:server - container_name: conductor-server - build: - context: ../ - dockerfile: docker/server/Dockerfile - networks: - - internal - ports: - - 8080:8080 - healthcheck: - test: [ "CMD", "curl","-I" ,"-XGET", "http://localhost:8080/health" ] - interval: 60s - timeout: 30s - retries: 12 - links: - - elasticsearch:es - - redis:rs - - postgres:postgresdb - depends_on: - elasticsearch: - condition: service_healthy - redis: - condition: service_healthy - postgres: - condition: service_healthy - logging: - driver: "json-file" - options: - max-size: "1k" - max-file: "3" - - postgres: - image: postgres - environment: - - POSTGRES_USER=conductor - - POSTGRES_PASSWORD=conductor - volumes: - - pgdata-conductor:/var/lib/postgresql/data - networks: - - internal - ports: - - 5432:5432 - healthcheck: - test: timeout 5 bash -c 'cat < /dev/null > /dev/tcp/localhost/5432' - interval: 5s - timeout: 5s - retries: 12 - logging: - driver: "json-file" - options: - max-size: "1k" - max-file: "3" - - redis: - image: redis:6.2.3-alpine - volumes: - - ./redis.conf:/usr/local/etc/redis/redis.conf - networks: - - internal - ports: - - 6379:6379 - healthcheck: - test: [ "CMD", "redis-cli","ping" ] - - elasticsearch: - image: v1r3n/elasticsearch:6.8.12 - container_name: elasticsearch - environment: - - "ES_JAVA_OPTS=-Xms512m -Xmx1024m" - - transport.host=0.0.0.0 - - discovery.type=single-node - - xpack.security.enabled=false - networks: - - internal - ports: - - 9200:9200 - - 9300:9300 - healthcheck: - test: wget http://localhost:9200/ -O /dev/null - interval: 5s - timeout: 5s - retries: 12 - logging: - driver: "json-file" - options: - max-size: "1k" - max-file: "3" - -volumes: - pgdata-conductor: - driver: local - -networks: - internal: diff --git a/docker/docker-compose-prometheus.yaml b/docker/docker-compose-prometheus.yaml deleted file mode 100644 index 10f8d80e40..0000000000 --- a/docker/docker-compose-prometheus.yaml +++ /dev/null @@ -1,20 +0,0 @@ -version: '3' - -services: - - prometheus: - image: prom/prometheus - volumes: - - ./prometheus/:/etc/prometheus/ - command: - - '--config.file=/etc/prometheus/prometheus.yml' - ports: - - 9090:9090 - external_links: - - conductor-server:conductor-server - networks: - - internal - restart: always - -networks: - internal: \ No newline at end of file diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 87619cd4f0..91cb3d4610 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -60,7 +60,7 @@ services: test: [ "CMD", "redis-cli","ping" ] elasticsearch: - image: v1r3n/elasticsearch:6.8.12 + image: elasticsearch:6.8.15 container_name: elasticsearch environment: - "ES_JAVA_OPTS=-Xms512m -Xmx1024m" diff --git a/docker/server/README.md b/docker/server/README.md index b35ef33633..1389f6b0f8 100644 --- a/docker/server/README.md +++ b/docker/server/README.md @@ -10,5 +10,5 @@ Run the following commands from the project root. ## Running the conductor server Conductor server requires redis, postgres and elastic search. -In order to build and run using Redis and Elastic Search `docker-compose -f docker-compose.yaml up` -Postgres and Elastic Search check [community](community-link) +In order to build and run using Redis and Elastic Search 6 run from the docker directory, `docker-compose -f docker-compose.yaml up` +Postgres and Elastic Search 7 check [community](community-link) diff --git a/docker/server/config/config-mysql.properties b/docker/server/config/config-mysql.properties deleted file mode 100755 index 7600398307..0000000000 --- a/docker/server/config/config-mysql.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Servers. -conductor.grpc-server.enabled=false - -# Database persistence type. -conductor.db.type=mysql - -spring.datasource.url=jdbc:mysql://mysql:3306/conductor -spring.datasource.username=conductor -spring.datasource.password=conductor - -# 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=true - -# Transport address to elasticsearch -conductor.elasticsearch.url=http://es:9200 - -# Name of the elasticsearch cluster -conductor.elasticsearch.indexName=conductor - -# Load sample kitchen sink workflow -loadSample=true diff --git a/docker/server/config/config-postgres.properties b/docker/server/config/config-postgres.properties deleted file mode 100755 index 2a27a5cac3..0000000000 --- a/docker/server/config/config-postgres.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Servers. -conductor.grpc-server.enabled=false - -# Database persistence type. -conductor.db.type=postgres - -spring.datasource.url=jdbc:postgresql://postgres:5432/conductor -spring.datasource.username=conductor -spring.datasource.password=conductor - -# 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=true - -# Transport address to elasticsearch -conductor.elasticsearch.url=http://es:9200 - -# Name of the elasticsearch cluster -conductor.elasticsearch.indexName=conductor - -# Load sample kitchen sink workflow -loadSample=true