From 1a234beaf6e7a8799ffbc4f7ea981c235c5647cb Mon Sep 17 00:00:00 2001
From: lars <lars@bls-media.de>
Date: Thu, 12 Sep 2024 13:52:42 +0200
Subject: [PATCH] anpassen der composefiles

---
 docker-compose.build copy.yml | 29 +++++++++++++++++++++++++++++
 docker-compose.build.yml      | 33 ++++++++++++---------------------
 docker-compose.yml            | 28 ++++++++++++++++------------
 3 files changed, 57 insertions(+), 33 deletions(-)
 create mode 100644 docker-compose.build copy.yml

diff --git a/docker-compose.build copy.yml b/docker-compose.build copy.yml
new file mode 100644
index 000000000..370fe84d2
--- /dev/null
+++ b/docker-compose.build copy.yml	
@@ -0,0 +1,29 @@
+services:
+  typebot-db:
+    image: postgres:13
+    restart: always
+    volumes:
+      - ${PWD}/.typebot-build/database:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_DB=typebot
+      - POSTGRES_PASSWORD=typebot
+  typebot-builder:
+    build:
+      context: .
+      args:
+        - SCOPE=builder
+    depends_on:
+      - typebot-db
+    ports:
+      - '8080:3000'
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
+    env_file: .env
+  typebot-viewer:
+    build:
+      context: .
+      args:
+        - SCOPE=viewer
+    ports:
+      - '8081:3000'
+    env_file: .env
\ No newline at end of file
diff --git a/docker-compose.build.yml b/docker-compose.build.yml
index b269a4afd..f0a196a4a 100644
--- a/docker-compose.build.yml
+++ b/docker-compose.build.yml
@@ -1,30 +1,21 @@
-version: '3.9'
 services:
-  typebot-db:
-    image: postgres:13
-    restart: always
-    volumes:
-      - ${PWD}/.typebot-build/database:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_DB=typebot
-      - POSTGRES_PASSWORD=typebot
-  typebot-builder:
+  builder:
     build:
       context: .
       args:
         - SCOPE=builder
-    depends_on:
-      - typebot-db
-    ports:
-      - '8080:3000'
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    env_file: .env
-  typebot-viewer:
+  
+  viewer:
     build:
       context: .
       args:
         - SCOPE=viewer
-    ports:
-      - '8081:3000'
-    env_file: .env
+
+### Befehle:
+
+##  Ohne Compose, aber mit "--platform"
+#   docker buildx build --platform linux/amd64 --build-arg SCOPE=builder --load -t bls-bot-builder:<TAG> .
+#   docker buildx build --platform linux/amd64 --build-arg SCOPE=viewer --load -t bls-bot-viewer:<TAG> .
+
+##  Mit Compose, aber ohne "--platform"
+#   docker-compose -f docker-compose.build.yml build
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index fbaede977..497140f59 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,32 +1,36 @@
-version: '3.3'
-
 volumes:
   db-data:
 
 services:
-  typebot-db:
+  BLS-bot_db:
+    container_name: BLS-bot_db
     image: postgres:14-alpine
     restart: always
     volumes:
-      - db-data:/var/lib/postgresql/data
+      - /Users/Docker/bot/datenbank:/var/lib/postgresql/data
     environment:
-      - POSTGRES_DB=typebot
-      - POSTGRES_PASSWORD=typebot
+      - POSTGRES_USER=bot
+      - POSTGRES_DB=bot
+      - POSTGRES_PASSWORD=dujzuc-fuznew
+    ports:
+      - 5050:5432
 
-  typebot-builder:
+  BLS-bot_builder:
+    container_name: BLS-bot_builder
     image: baptistearno/typebot-builder:latest
     restart: always
     depends_on:
-      - typebot-db
+      - BLS-bot_db
     ports:
-      - '8080:3000'
+      - 5055:3000
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file: .env
 
-  typebot-viewer:
+  BLS-bot_viewer:
+    container_name: BLS-bot_viewer
     image: baptistearno/typebot-viewer:latest
     restart: always
     ports:
-      - '8081:3000'
-    env_file: .env
+      - 5555:3000
+    env_file: .env
\ No newline at end of file