From a4a5200b0ee56f8ce9e12f56d571214d7923e814 Mon Sep 17 00:00:00 2001
From: "PATRICK-WORK\\Patrick" <patrick.kugelstadt-schneider@dachpc.com>
Date: Wed, 28 May 2025 13:22:49 +0200
Subject: [PATCH] fix merge conflict

---
 Dockerfile                |  2 +-
 docker-compose.yaml       | 15 +++++++++++++++
 docs/other/selfhosting.md | 21 ++++++++++++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 docker-compose.yaml

diff --git a/Dockerfile b/Dockerfile
index 93f650e9b..94b28e195 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:21.7.3-slim AS base
+FROM node:21-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 000000000..021de6b1b
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,15 @@
+services:
+  docs:
+    networks: [fmhy]
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: fmhy-docs
+    container_name: docs
+    restart: unless-stopped
+    ports:
+      - '4173:4173'
+
+
+networks:
+  fmhy:
diff --git a/docs/other/selfhosting.md b/docs/other/selfhosting.md
index 4f4f6df0a..af2dea4d0 100644
--- a/docs/other/selfhosting.md
+++ b/docs/other/selfhosting.md
@@ -13,6 +13,25 @@ Do note that you **must** differentiate your instance from the official site (fm
 
 #### Prerequisites
 
+### Docker (Experimental)
+
+You will need to install Docker and Docker Compose run your own instance of FMHY locally.
+
+- [Docker](https://docs.docker.com/get-docker/)
+- [Docker Compose](https://docs.docker.com/compose/install/)
+
+After installing Docker and Docker Compose, run the following commands:
+
+```bash
+git clone https://github.com/fmhy/edit.git
+cd edit
+sudo docker compose up --build
+```
+
+It should take a few minutes to build the image and start the container, running at port 4173.
+
+### Manually
+
 - [Git](https://git-scm.com/downloads)
 - [Node.js](https://nodejs.org/en/download/) - Use the latest available LTS, doesn't matter much
 - [pnpm 9.12.2 or newer](https://pnpm.io/installation)
@@ -104,4 +123,4 @@ You may want to disable NSFW content (sidebar entry, page contents) and/or the A
    rm -rf docs/.vitepress/cache
    rm -rf docs/.vitepress/dist
    pnpm install
-   ```
\ No newline at end of file
+   ```