From 925b2e5fb6b2543c9805ccaaf2abaf1cca73f1ce Mon Sep 17 00:00:00 2001 From: rodrigozhou Date: Fri, 26 Apr 2024 17:48:08 -0500 Subject: [PATCH] Update configs removing standard visibility support --- docker-compose-cass.yml | 55 ----------------------- docker-compose-cockroach-es.yml | 2 +- docker-compose-cockroach.yml | 2 +- docker-compose-multirole.yaml | 2 +- docker-compose-mysql-es.yml | 2 +- docker-compose-mysql.yml | 2 +- docker-compose-mysql8.yml | 61 ------------------------- docker-compose-postgres-opensearch.yml | 2 +- docker-compose-postgres.yml | 2 +- docker-compose-postgres12.yml | 62 -------------------------- docker-compose-tls.yml | 2 +- docker-compose.yml | 2 +- 12 files changed, 9 insertions(+), 187 deletions(-) delete mode 100644 docker-compose-cass.yml delete mode 100644 docker-compose-mysql8.yml delete mode 100644 docker-compose-postgres12.yml diff --git a/docker-compose-cass.yml b/docker-compose-cass.yml deleted file mode 100644 index 402700a8..00000000 --- a/docker-compose-cass.yml +++ /dev/null @@ -1,55 +0,0 @@ -version: "3.5" -services: - cassandra: - container_name: temporal-cassandra - image: cassandra:${CASSANDRA_VERSION} - networks: - - temporal-network - ports: - - 9042:9042 - volumes: - - /var/lib/cassandra - temporal: - container_name: temporal - depends_on: - - cassandra - environment: - - CASSANDRA_SEEDS=cassandra - - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development-cass.yaml - image: temporalio/auto-setup:${TEMPORAL_VERSION} - networks: - - temporal-network - ports: - - 7233:7233 - volumes: - - ./dynamicconfig:/etc/temporal/config/dynamicconfig - labels: - kompose.volume.type: configMap - temporal-admin-tools: - container_name: temporal-admin-tools - depends_on: - - temporal - environment: - - TEMPORAL_ADDRESS=temporal:7233 - - TEMPORAL_CLI_ADDRESS=temporal:7233 - image: temporalio/admin-tools:${TEMPORAL_VERSION} - networks: - - temporal-network - stdin_open: true - tty: true - temporal-ui: - container_name: temporal-ui - depends_on: - - temporal - environment: - - TEMPORAL_ADDRESS=temporal:7233 - - TEMPORAL_CORS_ORIGINS=http://localhost:3000 - image: temporalio/ui:${TEMPORAL_UI_VERSION} - networks: - - temporal-network - ports: - - 8080:8080 -networks: - temporal-network: - driver: bridge - name: temporal-network diff --git a/docker-compose-cockroach-es.yml b/docker-compose-cockroach-es.yml index 4224a919..4490f8cd 100644 --- a/docker-compose-cockroach-es.yml +++ b/docker-compose-cockroach-es.yml @@ -40,7 +40,7 @@ services: - cockroach - elasticsearch environment: - - DB=postgresql + - DB=postgres12 - DB_PORT=26257 - POSTGRES_USER=root - POSTGRES_PWD= diff --git a/docker-compose-cockroach.yml b/docker-compose-cockroach.yml index 1f4a4377..b65de4a5 100644 --- a/docker-compose-cockroach.yml +++ b/docker-compose-cockroach.yml @@ -22,7 +22,7 @@ services: depends_on: - cockroach environment: - - DB=postgresql + - DB=postgres12 - DB_PORT=26257 - POSTGRES_USER=root - POSTGRES_PWD= diff --git a/docker-compose-multirole.yaml b/docker-compose-multirole.yaml index cff1dde3..cdc7b884 100644 --- a/docker-compose-multirole.yaml +++ b/docker-compose-multirole.yaml @@ -61,7 +61,7 @@ services: - elasticsearch - postgresql environment: - - DB=postgresql + - DB=postgres12 - DB_PORT=${POSTGRES_DEFAULT_PORT} - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PWD=${POSTGRES_PASSWORD} diff --git a/docker-compose-mysql-es.yml b/docker-compose-mysql-es.yml index 1a7c0a51..ac18735d 100644 --- a/docker-compose-mysql-es.yml +++ b/docker-compose-mysql-es.yml @@ -34,7 +34,7 @@ services: - mysql - elasticsearch environment: - - DB=mysql + - DB=mysql8 - MYSQL_USER=root - MYSQL_PWD=root - MYSQL_SEEDS=mysql diff --git a/docker-compose-mysql.yml b/docker-compose-mysql.yml index f2d76389..b7522d6b 100644 --- a/docker-compose-mysql.yml +++ b/docker-compose-mysql.yml @@ -16,7 +16,7 @@ services: depends_on: - mysql environment: - - DB=mysql + - DB=mysql8 - DB_PORT=3306 - MYSQL_USER=root - MYSQL_PWD=root diff --git a/docker-compose-mysql8.yml b/docker-compose-mysql8.yml deleted file mode 100644 index b7522d6b..00000000 --- a/docker-compose-mysql8.yml +++ /dev/null @@ -1,61 +0,0 @@ -version: "3.5" -services: - mysql: - container_name: temporal-mysql - environment: - - MYSQL_ROOT_PASSWORD=root - image: mysql:${MYSQL_VERSION} - networks: - - temporal-network - ports: - - 3306:3306 - volumes: - - /var/lib/mysql - temporal: - container_name: temporal - depends_on: - - mysql - environment: - - DB=mysql8 - - DB_PORT=3306 - - MYSQL_USER=root - - MYSQL_PWD=root - - MYSQL_SEEDS=mysql - - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development-sql.yaml - image: temporalio/auto-setup:${TEMPORAL_VERSION} - networks: - - temporal-network - ports: - - 7233:7233 - volumes: - - ./dynamicconfig:/etc/temporal/config/dynamicconfig - labels: - kompose.volume.type: configMap - temporal-admin-tools: - container_name: temporal-admin-tools - depends_on: - - temporal - environment: - - TEMPORAL_ADDRESS=temporal:7233 - - TEMPORAL_CLI_ADDRESS=temporal:7233 - image: temporalio/admin-tools:${TEMPORAL_VERSION} - networks: - - temporal-network - stdin_open: true - tty: true - temporal-ui: - container_name: temporal-ui - depends_on: - - temporal - environment: - - TEMPORAL_ADDRESS=temporal:7233 - - TEMPORAL_CORS_ORIGINS=http://localhost:3000 - image: temporalio/ui:${TEMPORAL_UI_VERSION} - networks: - - temporal-network - ports: - - 8080:8080 -networks: - temporal-network: - driver: bridge - name: temporal-network diff --git a/docker-compose-postgres-opensearch.yml b/docker-compose-postgres-opensearch.yml index 94687326..b9c1f576 100644 --- a/docker-compose-postgres-opensearch.yml +++ b/docker-compose-postgres-opensearch.yml @@ -42,7 +42,7 @@ services: - postgresql - opensearch environment: - - DB=postgresql + - DB=postgres12 - DB_PORT=5432 - POSTGRES_USER=temporal - POSTGRES_PWD=temporal diff --git a/docker-compose-postgres.yml b/docker-compose-postgres.yml index c1a4774b..f12a3e9f 100644 --- a/docker-compose-postgres.yml +++ b/docker-compose-postgres.yml @@ -17,7 +17,7 @@ services: depends_on: - postgresql environment: - - DB=postgresql + - DB=postgres12 - DB_PORT=5432 - POSTGRES_USER=temporal - POSTGRES_PWD=temporal diff --git a/docker-compose-postgres12.yml b/docker-compose-postgres12.yml deleted file mode 100644 index f12a3e9f..00000000 --- a/docker-compose-postgres12.yml +++ /dev/null @@ -1,62 +0,0 @@ -version: "3.5" -services: - postgresql: - container_name: temporal-postgresql - environment: - POSTGRES_PASSWORD: temporal - POSTGRES_USER: temporal - image: postgres:${POSTGRESQL_VERSION} - networks: - - temporal-network - ports: - - 5432:5432 - volumes: - - /var/lib/postgresql/data - temporal: - container_name: temporal - depends_on: - - postgresql - environment: - - DB=postgres12 - - DB_PORT=5432 - - POSTGRES_USER=temporal - - POSTGRES_PWD=temporal - - POSTGRES_SEEDS=postgresql - - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development-sql.yaml - image: temporalio/auto-setup:${TEMPORAL_VERSION} - networks: - - temporal-network - ports: - - 7233:7233 - volumes: - - ./dynamicconfig:/etc/temporal/config/dynamicconfig - labels: - kompose.volume.type: configMap - temporal-admin-tools: - container_name: temporal-admin-tools - depends_on: - - temporal - environment: - - TEMPORAL_ADDRESS=temporal:7233 - - TEMPORAL_CLI_ADDRESS=temporal:7233 - image: temporalio/admin-tools:${TEMPORAL_VERSION} - networks: - - temporal-network - stdin_open: true - tty: true - temporal-ui: - container_name: temporal-ui - depends_on: - - temporal - environment: - - TEMPORAL_ADDRESS=temporal:7233 - - TEMPORAL_CORS_ORIGINS=http://localhost:3000 - image: temporalio/ui:${TEMPORAL_UI_VERSION} - networks: - - temporal-network - ports: - - 8080:8080 -networks: - temporal-network: - driver: bridge - name: temporal-network diff --git a/docker-compose-tls.yml b/docker-compose-tls.yml index 0289bb5d..219b73b1 100644 --- a/docker-compose-tls.yml +++ b/docker-compose-tls.yml @@ -63,7 +63,7 @@ services: - postgresql - elasticsearch environment: - - DB=postgresql + - DB=postgres12 - DB_PORT=5432 - POSTGRES_USER=temporal - POSTGRES_PWD=temporal diff --git a/docker-compose.yml b/docker-compose.yml index a048eec2..bb83b607 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,7 @@ services: - postgresql - elasticsearch environment: - - DB=postgresql + - DB=postgres12 - DB_PORT=5432 - POSTGRES_USER=temporal - POSTGRES_PWD=temporal