From ca1f3c3f6415dc384099a9cffc20e696d072d09e Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Fri, 8 Aug 2025 18:47:45 +0200
Subject: [PATCH] Move folders (#1098)

---
 dockerfiles/README.md                         |  8 +++---
 ...{Dockerfile.server.allinone => Dockerfile} |  0
 dockerfiles/docker-compose.all-in-one.yml     | 25 +++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)
 rename dockerfiles/all-in-one/{Dockerfile.server.allinone => Dockerfile} (100%)
 create mode 100644 dockerfiles/docker-compose.all-in-one.yml

diff --git a/dockerfiles/README.md b/dockerfiles/README.md
index 3455edd85..0e776b32d 100644
--- a/dockerfiles/README.md
+++ b/dockerfiles/README.md
@@ -10,10 +10,10 @@ Used to locally build Docker images from source instead of retrieving pre-built
 ### `docker-compose.dev.yml`
 Contains containers for aiding in local development of AliasVault. Provides a separate PostgreSQL instance for development on port 5433, managed via `./install.sh configure-dev-db`.
 
-### `Dockerfile.server.allinone`
-This is a all-in-one single-container build of the full AliasVault server stack for easy self-hosting, using s6-overlay to run multiple services (database, API, web, smtp, task runner) in one image.
+### `docker-compose.all-in-one.yml`
+This is a all-in-one single-container build of the full AliasVault server stack for easy self-hosting, using s6-overlay to run multiple services (database, API, web, smtp, task runner) in one container.
 
-This build is primarily intended for **limited platforms** like NAS devices, Unraid, or other **small home-use scenarios** where simplicity is preferred over flexibility.
+This build is primarily intended for **limited platforms** like NAS devices, Unraid, or other **small home-use scenarios** where simplicity is preferred over flexibility. All configuration is abstracted away as much as possible. You only need to start this one container.
 
 > **Note:** For production or more advanced setups, we recommend using the default multi-container configuration available via [`../docker-compose.yml`](../docker-compose.yml).
 
@@ -22,4 +22,4 @@ This build is primarily intended for **limited platforms** like NAS devices, Unr
 - **Standard deployment**: `./install.sh install` (uses multi-container setup and ../docker-compose.yml)
 - **Build from source**: `./install.sh build` (uses docker-compose.build.yml)
 - **Development database**: `./install.sh configure-dev-db start`
-- **Single container**: Build with `docker build -f Dockerfile.single` and deploy with `docker-compose.single.yml`
\ No newline at end of file
+- **Single container**: Deploy with `docker-compose.all-in-one.yml`
\ No newline at end of file
diff --git a/dockerfiles/all-in-one/Dockerfile.server.allinone b/dockerfiles/all-in-one/Dockerfile
similarity index 100%
rename from dockerfiles/all-in-one/Dockerfile.server.allinone
rename to dockerfiles/all-in-one/Dockerfile
diff --git a/dockerfiles/docker-compose.all-in-one.yml b/dockerfiles/docker-compose.all-in-one.yml
new file mode 100644
index 000000000..78e58f190
--- /dev/null
+++ b/dockerfiles/docker-compose.all-in-one.yml
@@ -0,0 +1,25 @@
+version: "3"
+
+services:
+  aliasvault:
+    image: cr.xivi.nl/aliasvault/aliasvault-all-in-one:latest
+    container_name: aliasvault
+    restart: unless-stopped
+
+    ports:
+      - "80:80"
+      - "443:443"
+      - "25:25"
+      - "587:587"
+
+    volumes:
+      - ./database:/database
+      - ./certificates:/certificates
+      - ./logs:/logs
+      - ./secrets:/secrets
+
+    environment:
+      PUBLIC_REGISTRATION_ENABLED: "true"
+      IP_LOGGING_ENABLED: "true"
+      SUPPORT_EMAIL: ""
+      PRIVATE_EMAIL_DOMAINS: ""