jack 3 kuukautta sitten
vanhempi
commit
278bab2c8e
1 muutettua tiedostoa jossa 13 lisäystä ja 13 poistoa
  1. 13 13
      docker-compose.yaml

+ 13 - 13
docker-compose.yaml

@@ -51,14 +51,14 @@ services:
     image: postgres:latest
     image: postgres:latest
     environment:
     environment:
       POSTGRES_DB: ${HATCHET_POSTGRES_DBNAME:-hatchet}
       POSTGRES_DB: ${HATCHET_POSTGRES_DBNAME:-hatchet}
-      POSTGRES_USER: ${HATCHET_POSTGRES_USER:-hatchet_user}
-      POSTGRES_PASSWORD: ${HATCHET_POSTGRES_PASSWORD:-hatchet_password}
+      POSTGRES_USER: ${HATCHET_POSTGRES_USER:-postgres}
+      POSTGRES_PASSWORD: ${HATCHET_POSTGRES_PASSWORD:-cocorobo-123}
     volumes:
     volumes:
       - hatchet_postgres_data:/var/lib/postgresql/data
       - hatchet_postgres_data:/var/lib/postgresql/data
     networks:
     networks:
       - r2r-network
       - r2r-network
     healthcheck:
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U ${HATCHET_POSTGRES_USER:-hatchet_user} -d ${HATCHET_POSTGRES_DBNAME:-hatchet}" ]
+      test: [ "CMD-SHELL", "pg_isready -U ${HATCHET_POSTGRES_USER:-postgres} -d ${HATCHET_POSTGRES_DBNAME:-hatchet}" ]
       interval: 10s
       interval: 10s
       timeout: 5s
       timeout: 5s
       retries: 5
       retries: 5
@@ -89,26 +89,26 @@ services:
       sh -c "
       sh -c "
         set -e
         set -e
         echo 'Waiting for PostgreSQL to be ready...'
         echo 'Waiting for PostgreSQL to be ready...'
-        while ! pg_isready -h hatchet-postgres -p 5432 -U ${HATCHET_POSTGRES_USER:-hatchet_user}; do
+        while ! pg_isready -h hatchet-postgres -p 5432 -U ${HATCHET_POSTGRES_USER:-postgres}; do
           sleep 1
           sleep 1
         done
         done
         echo 'PostgreSQL is ready, checking if database exists...'
         echo 'PostgreSQL is ready, checking if database exists...'
-        if ! PGPASSWORD=${HATCHET_POSTGRES_PASSWORD:-hatchet_password} psql -h hatchet-postgres -p 5432 -U ${HATCHET_POSTGRES_USER:-hatchet_user} -lqt | grep -qw ${HATCHET_POSTGRES_DBNAME:-hatchet}; then
+        if ! PGPASSWORD=${HATCHET_POSTGRES_PASSWORD:-cocorobo-123} psql -h hatchet-postgres -p 5432 -U ${HATCHET_POSTGRES_USER:-postgres} -lqt | grep -qw ${HATCHET_POSTGRES_DBNAME:-hatchet}; then
           echo 'Database does not exist, creating it...'
           echo 'Database does not exist, creating it...'
-          PGPASSWORD=${HATCHET_POSTGRES_PASSWORD:-hatchet_password} createdb -h hatchet-postgres -p 5432 -U ${HATCHET_POSTGRES_USER:-hatchet_user} -w ${HATCHET_POSTGRES_DBNAME:-hatchet}
+          PGPASSWORD=${HATCHET_POSTGRES_PASSWORD:-cocorobo-123} createdb -h hatchet-postgres -p 5432 -U ${HATCHET_POSTGRES_USER:-postgres} -w ${HATCHET_POSTGRES_DBNAME:-hatchet}
         else
         else
           echo 'Database already exists, skipping creation.'
           echo 'Database already exists, skipping creation.'
         fi
         fi
       "
       "
     environment:
     environment:
-      DATABASE_URL: "postgres://${HATCHET_POSTGRES_USER:-hatchet_user}:${HATCHET_POSTGRES_PASSWORD:-hatchet_password}@hatchet-postgres:5432/${HATCHET_POSTGRES_DBNAME:-hatchet}?sslmode=disable"
+      DATABASE_URL: "postgres://${HATCHET_POSTGRES_USER:-postgres}:${HATCHET_POSTGRES_PASSWORD:-cocorobo-123}@hatchet-postgres:5432/${HATCHET_POSTGRES_DBNAME:-hatchet}?sslmode=disable"
     networks:
     networks:
       - r2r-network
       - r2r-network
 
 
   hatchet-migration:
   hatchet-migration:
     image: ghcr.io/hatchet-dev/hatchet/hatchet-migrate:latest
     image: ghcr.io/hatchet-dev/hatchet/hatchet-migrate:latest
     environment:
     environment:
-      DATABASE_URL: "postgres://${HATCHET_POSTGRES_USER:-hatchet_user}:${HATCHET_POSTGRES_PASSWORD:-hatchet_password}@hatchet-postgres:5432/${HATCHET_POSTGRES_DBNAME:-hatchet}?sslmode=disable"
+      DATABASE_URL: "postgres://${HATCHET_POSTGRES_USER:-postgres}:${HATCHET_POSTGRES_PASSWORD:-cocorobo-123}@hatchet-postgres:5432/${HATCHET_POSTGRES_DBNAME:-hatchet}?sslmode=disable"
     depends_on:
     depends_on:
       hatchet-create-db:
       hatchet-create-db:
         condition: service_completed_successfully
         condition: service_completed_successfully
@@ -119,15 +119,15 @@ services:
     image: ghcr.io/hatchet-dev/hatchet/hatchet-admin:latest
     image: ghcr.io/hatchet-dev/hatchet/hatchet-admin:latest
     command: /hatchet/hatchet-admin quickstart --skip certs --generated-config-dir /hatchet/config --overwrite=false
     command: /hatchet/hatchet-admin quickstart --skip certs --generated-config-dir /hatchet/config --overwrite=false
     environment:
     environment:
-      DATABASE_URL: "postgres://${HATCHET_POSTGRES_USER:-hatchet_user}:${HATCHET_POSTGRES_PASSWORD:-hatchet_password}@hatchet-postgres:5432/${HATCHET_POSTGRES_DBNAME:-hatchet}?sslmode=disable"
+      DATABASE_URL: "postgres://${HATCHET_POSTGRES_USER:-postgres}:${HATCHET_POSTGRES_PASSWORD:-cocorobo-123}@hatchet-postgres:5432/${HATCHET_POSTGRES_DBNAME:-hatchet}?sslmode=disable"
 
 
       HATCHET_CLIENT_GRPC_MAX_RECV_MESSAGE_LENGTH: "${HATCHET_CLIENT_GRPC_MAX_RECV_MESSAGE_LENGTH:-134217728}"
       HATCHET_CLIENT_GRPC_MAX_RECV_MESSAGE_LENGTH: "${HATCHET_CLIENT_GRPC_MAX_RECV_MESSAGE_LENGTH:-134217728}"
       HATCHET_CLIENT_GRPC_MAX_SEND_MESSAGE_LENGTH: "${HATCHET_CLIENT_GRPC_MAX_SEND_MESSAGE_LENGTH:-134217728}"
       HATCHET_CLIENT_GRPC_MAX_SEND_MESSAGE_LENGTH: "${HATCHET_CLIENT_GRPC_MAX_SEND_MESSAGE_LENGTH:-134217728}"
 
 
       DATABASE_POSTGRES_PORT: "5432"
       DATABASE_POSTGRES_PORT: "5432"
       DATABASE_POSTGRES_HOST: hatchet-postgres
       DATABASE_POSTGRES_HOST: hatchet-postgres
-      DATABASE_POSTGRES_USERNAME: "${HATCHET_POSTGRES_USER:-hatchet_user}"
-      DATABASE_POSTGRES_PASSWORD: "${HATCHET_POSTGRES_PASSWORD:-hatchet_password}"
+      DATABASE_POSTGRES_USERNAME: "${HATCHET_POSTGRES_USER:-postgres}"
+      DATABASE_POSTGRES_PASSWORD: "${HATCHET_POSTGRES_PASSWORD:-cocorobo-123}"
       HATCHET_DATABASE_POSTGRES_DB_NAME: "${HATCHET_POSTGRES_DBNAME:-hatchet}"
       HATCHET_DATABASE_POSTGRES_DB_NAME: "${HATCHET_POSTGRES_DBNAME:-hatchet}"
 
 
       SERVER_TASKQUEUE_RABBITMQ_URL: amqp://user:password@hatchet-rabbitmq:5672/
       SERVER_TASKQUEUE_RABBITMQ_URL: amqp://user:password@hatchet-rabbitmq:5672/
@@ -159,7 +159,7 @@ services:
     ports:
     ports:
       - "${R2R_HATCHET_ENGINE_PORT:-7077}:7077"
       - "${R2R_HATCHET_ENGINE_PORT:-7077}:7077"
     environment:
     environment:
-      DATABASE_URL: "postgres://${HATCHET_POSTGRES_USER:-hatchet_user}:${HATCHET_POSTGRES_PASSWORD:-hatchet_password}@hatchet-postgres:5432/${HATCHET_POSTGRES_DBNAME:-hatchet}?sslmode=disable"
+      DATABASE_URL: "postgres://${HATCHET_POSTGRES_USER:-postgres}:${HATCHET_POSTGRES_PASSWORD:-cocorobo-123}@hatchet-postgres:5432/${HATCHET_POSTGRES_DBNAME:-hatchet}?sslmode=disable"
       SERVER_GRPC_BROADCAST_ADDRESS: "hatchet-engine:7077"
       SERVER_GRPC_BROADCAST_ADDRESS: "hatchet-engine:7077"
       SERVER_GRPC_BIND_ADDRESS: "0.0.0.0"
       SERVER_GRPC_BIND_ADDRESS: "0.0.0.0"
       SERVER_GRPC_PORT: "7077"
       SERVER_GRPC_PORT: "7077"
@@ -184,7 +184,7 @@ services:
       hatchet-setup-config:
       hatchet-setup-config:
         condition: service_completed_successfully
         condition: service_completed_successfully
     environment:
     environment:
-      DATABASE_URL: "postgres://${HATCHET_POSTGRES_USER:-hatchet_user}:${HATCHET_POSTGRES_PASSWORD:-hatchet_password}@hatchet-postgres:5432/${HATCHET_POSTGRES_DBNAME:-hatchet}?sslmode=disable"
+      DATABASE_URL: "postgres://${HATCHET_POSTGRES_USER:-postgres}:${HATCHET_POSTGRES_PASSWORD:-cocorobo-123}@hatchet-postgres:5432/${HATCHET_POSTGRES_DBNAME:-hatchet}?sslmode=disable"
     volumes:
     volumes:
       - hatchet_certs:/hatchet/certs
       - hatchet_certs:/hatchet/certs
       - hatchet_config:/hatchet/config
       - hatchet_config:/hatchet/config