dbeaver

.env

@@ -6,8 +6,8 @@ POSTGRES_PORT = 5432
 PGADMIN_DEFAULT_EMAIL = user@user
 PGADMIN_DEFAULT_EMAIL = user@user
 PGADMIN_DEFAULT_PASSWORD = password
 PGADMIN_DEFAULT_PASSWORD = password
 PGADMIN_PORT = 8888
 PGADMIN_PORT = 8888
-SALT_USER = saltuser1
-SALT_PASSWORD = password
+#SALT_USER = saltuser
+#SALT_PASSWORD = password
 CLOUDBEAVER_AUTH_PROXY_PROVIDER_URI=http://localhost:8978
 CLOUDBEAVER_AUTH_PROXY_PROVIDER_URI=http://localhost:8978
 CLOUDBEAVER_ADMIN_USERNAME=admin
 CLOUDBEAVER_ADMIN_USERNAME=admin
 CLOUDBEAVER_ADMIN_PASSWORD=admin
 CLOUDBEAVER_ADMIN_PASSWORD=admin
@@ -15,4 +15,5 @@ CLOUDBEAVER_POSTGRES_HOST=postgres
 CLOUDBEAVER_POSTGRES_PORT=5432
 CLOUDBEAVER_POSTGRES_PORT=5432
 CLOUDBEAVER_POSTGRES_DB=${POSTGRES_DB}
 CLOUDBEAVER_POSTGRES_DB=${POSTGRES_DB}
 CLOUDBEAVER_POSTGRES_USER=${POSTGRES_USER}
 CLOUDBEAVER_POSTGRES_USER=${POSTGRES_USER}
-CLOUDBEAVER_POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+CLOUDBEAVER_POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
\ No newline at end of file
+CLOUNDBEAVER_PORT = 8978

docker-compose.yml

@@ -11,8 +11,8 @@ services:
       - "4506:4506"  
       - "4506:4506"  
       - "8000:8000"  
       - "8000:8000"  
     environment:
     environment:
-      - SALT_USER=${SALT_USER:-saltuser}
-      - SALT_PASSWORD=${SALT_PASSWORD:-saltpassword}
+      - SALT_USER=saltuser
+      - SALT_PASSWORD=saltpassword
     volumes:
     volumes:
       - ./salt-master:/etc/salt/master.d 
       - ./salt-master:/etc/salt/master.d 
 
 
@@ -64,6 +64,8 @@ services:
     restart: always
     restart: always
     depends_on:
     depends_on:
       - pg_grafana
       - pg_grafana
+    ports:
+      - "${CLOUNDBEAVER_PORT:-8978}:8978"
     volumes:
     volumes:
       - volume-cloudbeaver:/opt/cloudbeaver/workspace
       - volume-cloudbeaver:/opt/cloudbeaver/workspace
     environment:
     environment:

docker-compose.yml.save

+version: '3.8'
+
+services:
+ 
+
+  salt-master:
+    build: .  
+    container_name: salt-master
+    ports:
+      - "4505:4505"  
+      - "4506:4506"  
+      - "8000:8000"  
+    environment:
+      - SALT_USER=${SALT_USER:-saltuser}
+      - SALT_PASSWORD=${SALT_PASSWORD:-saltpassword}
+    volumes:
+      - ./salt-master:/etc/salt/master.d 
+
+  pg_grafana:
+    image: harbor.nexpie.com/flowstack/postgresql:1.0.1-0-3af5ae67
+    restart: always  
+    environment:
+      - POSTGRES_DB =${POSTGRES_DB:-postgres}
+      - POSTGRES_USER=${POSTGRES_USER:-user}  # Set environment variable POSTGRES_USER with default value 'user'
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}  # Set environment variable POSTGRES_PASSWORD with default value 'password' (not recommended for security reasons)
+    volumes:
+      - postgres:/data/postgres  # Mount named volume 'postgres' to /data/postgres in container
+    ports:
+      - "5432:5432"  # Map host port 5432 to container port 5432
+    networks:
+      - postgres  # Connect container to the 'postgres' network
+
+  grafana:
+    restart: always  # Restart container automatically on failure
+    depends_on:
+      - pg_grafana  # Wait for pg_grafana service to be up before starting
+    image: harbor.nexpie.com/flowstack/grafana:10.3.1-1  # Use specific Grafana image
+#    image: grafana/grafana-enterprise
+    environment:
+      - GF_FLOWSTACK_POSTGRES_ENDPOINT=${POSTGRES_ENDPOINT:-pg_grafana}:${POSTGRES_PORT:-5432}  # Set Grafana database host (pg_grafana service name)
+      - GF_FLOWSTACK_POSTGRES_DATABASE=${POSTGRES_DB:-postgres}  # Set Grafana database name (environment variable not defined)
+      - GF_FLOWSTACK_POSTGRES_USER=${POSTGRES_USER:-user}  # Incorrect variable reference, use ${POSTGRES_USER}
+      - GF_FLOWSTACK_POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}  # Incorrect variable reference, use ${POSTGRES_PASSWORD}
+#      - GF_DATABASE_SSL_MODE=disable  # Disable SSL mode for database connection
+    ports:
+      - "43000:3000"  # Map host port 43000 to container port 3000 (default Grafana port)
+
+  pgadmin:
+    container_name: pgadmin_container
+    image: dpage/pgadmin4
+    environment:
+      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL:-pgadmin4@pgadmin.org}  # Set default email for pgAdmin with fallback
+      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD:-admin}  # Set default password for pgAdmin with fallback
+      - PGADMIN_CONFIG_SERVER_MODE=False  # Disable server mode for pgAdmin
+    volumes:
+      - pgadmin:/var/lib/pgadmin  # Mount named volume 'pgadmin' to /var/lib/pgadmin in container
+    ports:
+      - "${PGADMIN_PORT:-8888}:80"  # Map host port defined by PGADMIN_PORT (default 8888) to container port 80
+    networks:
+      - postgres  # Connect container to the 'postgres' network
+    restart: unless-stopped  # Restart container only if it exits abnormally
+  cloudbeaver:
+    image: harbor.nexpie.com/flowstack/cloudbeaver:1.0.1-3-97145ca9 #1.0.1-0-f0c07f4d
+    restart: always
+    depends_on:
+      - pg_grafana
+    ports:
+      - ":3000"
+    volumes:
+      - volume-cloudbeaver:/opt/cloudbeaver/workspace
+    environment:
+      - CLOUDBEAVER_AUTH_PROXY_PROVIDER_URI=${CLOUDBEAVER_AUTH_PROXY_PROVIDER_URI}
+      - CLOUDBEAVER_ADMIN_USERNAME=${CLOUDBEAVER_ADMIN_USERNAME}
+      - CLOUDBEAVER_ADMIN_PASSWORD=${CLOUDBEAVER_ADMIN_PASSWORD}
+      - CLOUDBEAVER_POSTGRES_HOST=postgres
+      - CLOUDBEAVER_POSTGRES_PORT=5432
+      - CLOUDBEAVER_POSTGRES_DB=${POSTGRES_DB}
+      - CLOUDBEAVER_POSTGRES_USER=${POSTGRES_USER}
+      - CLOUDBEAVER_POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+
+networks:
+  postgres:
+    driver: bridge  # Create a bridge network for communication
+
+volumes:
+  postgres:  # Empty volume definition for pg_grafana
+  pgadmin:  # Empty volume definition for pgadmin
+  volume-cloudbeaver: