From 7a197df57ce05ff953acd59e67f3b8ffe10f434c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D1=82=D0=BDomas?= <peter.khoma@gmail.com>
Date: Thu, 20 Jan 2022 22:09:33 +0200
Subject: [PATCH 1/2] fix: Fixes docker-compose up error and warning

---
 frontend/scripts/docker-buildfiles/docker-compose.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/scripts/docker-buildfiles/docker-compose.yml b/frontend/scripts/docker-buildfiles/docker-compose.yml
index 67fb26ab9f..b1be260e62 100755
--- a/frontend/scripts/docker-buildfiles/docker-compose.yml
+++ b/frontend/scripts/docker-buildfiles/docker-compose.yml
@@ -5,8 +5,11 @@ services:
     build: .
     stdin_open: true 
     # tty: true
+    devices:
+      - "/dev/dri:/dev/dri"  # fixes MESA-LOADER error
     environment:
       - DISPLAY=${DISPLAY}
+      - NO_AT_BRIDGE=1  # fixes dbind-WARNING
     volumes:
       - $HOME/.Xauthority:/root/.Xauthority:rw
-    network_mode: host
\ No newline at end of file
+    network_mode: host

From 32ee068c73a6b07ee6c5a1df0b74fc4910cbf439 Mon Sep 17 00:00:00 2001
From: "Lucas.Xu" <lucas.xu@appflowy.io>
Date: Mon, 18 Jul 2022 17:58:15 +0800
Subject: [PATCH 2/2] chore: resolve docker-compose.yml conflicts

---
 .../scripts/docker-buildfiles/docker-compose.yml   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/frontend/scripts/docker-buildfiles/docker-compose.yml b/frontend/scripts/docker-buildfiles/docker-compose.yml
index b1be260e62..ac1cc29339 100755
--- a/frontend/scripts/docker-buildfiles/docker-compose.yml
+++ b/frontend/scripts/docker-buildfiles/docker-compose.yml
@@ -3,13 +3,21 @@ version: "3"
 services:
   app:
     build: .
-    stdin_open: true 
+    image: appflowy/appflowy:latest
+    stdin_open: true
     # tty: true
     devices:
-      - "/dev/dri:/dev/dri"  # fixes MESA-LOADER error
+      - "/dev/dri:/dev/dri" # fixes MESA-LOADER error
     environment:
       - DISPLAY=${DISPLAY}
-      - NO_AT_BRIDGE=1  # fixes dbind-WARNING
+      - NO_AT_BRIDGE=1 # fixes dbind-WARNING
     volumes:
       - $HOME/.Xauthority:/root/.Xauthority:rw
+      - /tmp/.X11-unix:/tmp/.X11-unix
+      - /dev/dri:/dev/dri
+      - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
+      - appflowy-data:/home/makepkg
     network_mode: host
+
+volumes:
+  appflowy-data: