From 883e71612cb0bfab079fafabe9c6caee74e445ca Mon Sep 17 00:00:00 2001
From: slashtechno <77907286+slashtechno@users.noreply.github.com>
Date: Wed, 7 Aug 2024 13:39:56 -0400
Subject: [PATCH 1/5] Use `triliumnext/notes` as image in `docker-compose.yml`
 Also added comments to `docker-compose.yml` and removed unused volumes

---
 docker-compose.yml | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6798574ac..329db7d25 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,23 @@
+# TL;DR:
 # Running `docker-compose up` will create/use the "trilium-data" directory in the user home
 # Run `TRILIUM_DATA_DIR=/path/of/your/choice docker-compose up` to set a different directory
-version: '2.1'
-services:
-  trilium:
-    image: zadam/trilium
-    restart: always
-    environment:
-      - TRILIUM_DATA_DIR=/home/node/trilium-data
-    ports:
-      - "8080:8080"
-    volumes:
-      - ${TRILIUM_DATA_DIR:-~/trilium-data}:/home/node/trilium-data
+# To run in the background, use `docker-compose up -d`
 
-volumes:
-  trilium:
+services:
+    trilium:
+        # Optionally, replace `latest` with a version tag like `v0.90.3`
+        # Using `latest` may cause unintended updates to the container
+        image: triliumnext/notes:latest
+        # Restart the container unless it was stopped by the user
+        restart: unless-stopped
+        environment:
+            - TRILIUM_DATA_DIR=/home/node/trilium-data
+        ports:
+            # By default, Trilium will be available at http://localhost:8080
+            # It will also be accessible at http://<host-ip>:8080
+            # You might want to limit this with something like Docker Networks, reverse proxies, or firewall rules, such as UFW
+            - '8080:8080'
+        volumes:
+            # Unless TRILIUM_DATA_DIR is set, the data will be stored in the "trilium-data" directory in the home directory.
+            # This can also be changed with by replacing the line below with `- /path/of/your/choice:/home/node/trilium-data
+            - ${TRILIUM_DATA_DIR:-~/trilium-data}:/home/node/trilium-data

From 4bc24246ab5289e2f8f6d3f15a6d2475c6265e07 Mon Sep 17 00:00:00 2001
From: slashtechno <77907286+slashtechno@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:51:29 -0400
Subject: [PATCH 2/5] Update Docker image tag in build script

---
 bin/build-docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/build-docker.sh b/bin/build-docker.sh
index 9d614eb2b..c2e921169 100755
--- a/bin/build-docker.sh
+++ b/bin/build-docker.sh
@@ -10,7 +10,7 @@ cat package.json | grep -v electron > server-package.json
 echo "Compiling typescript..."
 npx tsc
 
-sudo docker build -t zadam/trilium:$VERSION --network host -t zadam/trilium:$SERIES .
+sudo docker build -t triliumnext/notes:$VERSION --network host -t zadam/trilium:$SERIES .
 
 if [[ $VERSION != *"beta"* ]]; then
   sudo docker tag zadam/trilium:$VERSION zadam/trilium:latest

From b7ce4d04baf5523fa30860e897054654a050623d Mon Sep 17 00:00:00 2001
From: slashtechno <77907286+slashtechno@users.noreply.github.com>
Date: Thu, 8 Aug 2024 09:06:40 -0400
Subject: [PATCH 3/5] revert spacing to what it was before

---
 docker-compose.yml | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 329db7d25..83f0fcc31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,23 +1,21 @@
-# TL;DR:
 # Running `docker-compose up` will create/use the "trilium-data" directory in the user home
 # Run `TRILIUM_DATA_DIR=/path/of/your/choice docker-compose up` to set a different directory
 # To run in the background, use `docker-compose up -d`
-
 services:
-    trilium:
-        # Optionally, replace `latest` with a version tag like `v0.90.3`
-        # Using `latest` may cause unintended updates to the container
-        image: triliumnext/notes:latest
-        # Restart the container unless it was stopped by the user
-        restart: unless-stopped
-        environment:
-            - TRILIUM_DATA_DIR=/home/node/trilium-data
-        ports:
-            # By default, Trilium will be available at http://localhost:8080
-            # It will also be accessible at http://<host-ip>:8080
-            # You might want to limit this with something like Docker Networks, reverse proxies, or firewall rules, such as UFW
-            - '8080:8080'
-        volumes:
-            # Unless TRILIUM_DATA_DIR is set, the data will be stored in the "trilium-data" directory in the home directory.
-            # This can also be changed with by replacing the line below with `- /path/of/your/choice:/home/node/trilium-data
-            - ${TRILIUM_DATA_DIR:-~/trilium-data}:/home/node/trilium-data
+  trilium:
+    # Optionally, replace `latest` with a version tag like `v0.90.3`
+    # Using `latest` may cause unintended updates to the container
+    image: triliumnext/notes:latest
+    # Restart the container unless it was stopped by the user
+    restart: unless-stopped`
+    environment:
+      - TRILIUM_DATA_DIR=/home/node/trilium-data
+    ports:
+      # By default, Trilium will be available at http://localhost:8080
+      # It will also be accessible at http://<host-ip>:8080
+      # You might want to limit this with something like Docker Networks, reverse proxies, or firewall rules, such as UFW
+      - '8080:8080'
+    volumes:
+      # Unless TRILIUM_DATA_DIR is set, the data will be stored in the "trilium-data" directory in the home directory.
+      # This can also be changed with by replacing the line below with `- /path/of/your/choice:/home/node/trilium-data
+      - ${TRILIUM_DATA_DIR:-~/trilium-data}:/home/node/trilium-data

From 5fbda79dbe8a5f3337e23692d2612c10031add94 Mon Sep 17 00:00:00 2001
From: slashtechno <77907286+slashtechno@users.noreply.github.com>
Date: Thu, 8 Aug 2024 10:21:13 -0400
Subject: [PATCH 4/5] Remove erroneous backtick

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 83f0fcc31..d6f5a3c65 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     # Using `latest` may cause unintended updates to the container
     image: triliumnext/notes:latest
     # Restart the container unless it was stopped by the user
-    restart: unless-stopped`
+    restart: unless-stopped
     environment:
       - TRILIUM_DATA_DIR=/home/node/trilium-data
     ports:

From 513b0c65975944ed0b4350852b9b24909ca48a2a Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Thu, 8 Aug 2024 23:26:58 +0300
Subject: [PATCH 5/5] ci: Remove problematic platforms for now

---
 .github/workflows/main-docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml
index 96bffbd6e..8e09f6b00 100644
--- a/.github/workflows/main-docker.yml
+++ b/.github/workflows/main-docker.yml
@@ -16,7 +16,7 @@ env:
     DOCKERHUB_REGISTRY: docker.io
     IMAGE_NAME: ${{ github.repository }}
     TEST_TAG: triliumnext/notes:test
-    PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+    PLATFORMS: linux/amd64,linux/arm64
 
 jobs:
     test_docker: