Move Docker files into server directory, split and update README

Resolves: https://github.com/lmg-anon/mikupad/pull/116#issuecomment-3475060622

README-DOCKER.md

@@ -0,0 +1,48 @@
+## Running with Docker
+
+You can also run **mikupad** using Docker. This automatically compiles the HTML and runs the custom NodeJS server, which serves the HTML, among other functions.
+
+First, copy `server/.env.example` to `server/.env`. Then, **change your username and password**; anyone who has access to your hosted **mikupad** can store and load sessions, and proxy network requests through your server!
+
+To run the server:
+
+```shell
+docker compose -f server/docker-compose.yml up --build -d
+```
+
+Then visit http://localhost:3000/.
+
+Note that by default, the server will automatically start when Docker starts (which likely also starts on login). To stop the server, and at the same time also stop it from automatically starting up:
+
+```shell
+docker compose -f server/docker-compose.yml down
+```
+
+### Adding HTTPS support
+
+You can also add HTTPS support, for example, if you wish to use **mikupad** remotely without revealing your generations or password to the entire world.
+
+First, copy and rename `server/docker-compose.override.example.yml` to `server/docker-compose.override.yml`. Then, uncomment `services:`, as well as the `ADD HTTPS SUPPORT` section. You may also wish to remove unencrypted HTTP support by uncommenting the `REMOVE HTTP SUPPORT` section.
+
+You will also need to provide a SSL certificate. You can do this in any way you wish, such as obtaining one from a [certificate authority](https://letsencrypt.org/) or creating a self-signed one yourself. Regardless, place the public certificate and the private key files in the `https` folder like so:
+
+```shell
+$ ls server/https
+nginx.conf  private.key  public.crt
+```
+
+If you have already started the server, run this command to start up the HTTPS server as well:
+
+```shell
+docker compose -f server/docker-compose.yml up -d
+```
+
+Then visit https://localhost:3443/.
+
+### Using AI servers running on localhost when running mikupad in Docker
+
+By default, **mikupad** running in server mode will proxy requests to any endpoints. For example, if you are running Ollama (which is OpenAI compatible), you can set the endpoint to `http://localhost:11434` and it'll work.
+
+However, in Docker, you need to replace `localhost` with `host.docker.internal`. For example, the correct endpoint to use for Ollama is `http://host.docker.internal:11434`.
+
+If you are on Linux, you'd need to copy and rename `server/docker-compose.override.example.yml` to `server/docker-compose.override.yml`. Then, uncomment `services:`, as well as the `ADD LOCALHOST AI SERVER SUPPORT FOR LINUX USERS` section.

README.md

@@ -36,55 +36,6 @@ To use **mikupad** fully offline, run the provided `compile` script or download
 
 You can also [try it on GitHub Pages](https://lmg-anon.github.io/mikupad/mikupad.html).
 
-## Running with Docker
-
-You can also run **mikupad** using Docker. This automatically compiles the HTML and runs the custom NodeJS server, which serves the HTML, among other functions.
-
-First, copy `.env.example` to `.env`. Then, **change your username and password**; anyone who has access to your hosted **mikupad** can store and load sessions, and proxy network requests through your server!
-
-To run the server:
-
-```shell
-docker compose up --build -d
-```
-
-Then visit http://localhost:3000/.
-
-Note that by default, the server will automatically start when Docker starts (which likely also starts on login). To stop the server, and at the same time also stop it from automatically starting up:
-
-```shell
-docker compose down
-```
-
-### Adding HTTPS support
-
-You can also add HTTPS support, for example, if you wish to use **mikupad** remotely without revealing your generations or password to the entire world.
-
-First, copy and rename `docker-compose.override.example.yml` to `docker-compose.override.yml`. Then, uncomment `services:`, as well as the `ADD HTTPS SUPPORT` section. You may also wish to remove unencrypted HTTP support by uncommenting the `REMOVE HTTP SUPPORT` section.
-
-You will also need to provide a SSL certificate. You can do this in any way you wish, such as obtaining one from a [certificate authority](https://letsencrypt.org/) or creating a self-signed one yourself. Regardless, place the public certificate and the private key files in the `https` folder like so:
-
-```shell
-mikupad/https$ ls
-nginx.conf  private.key  public.crt
-```
-
-If you have already started the server, run this command to start up the HTTPS server as well:
-
-```shell
-docker compose up -d
-```
-
-Then visit https://localhost:3443/.
-
-### Using AI servers running on localhost when running mikupad in Docker
-
-By default, **mikupad** running in server mode will proxy requests to any endpoints. For example, if you are running Ollama (which is OpenAI compatible), you can set the endpoint to `http://localhost:11434` and it'll work.
-
-However, in Docker, you need to replace `localhost` with `host.docker.internal`. For example, the correct endpoint to use for Ollama is `http://host.docker.internal:11434`.
-
-If you are on Linux, you'd need to copy and rename `docker-compose.override.example.yml` to `docker-compose.override.yml`. Then, uncomment `services:`, as well as the `ADD LOCALHOST AI SERVER SUPPORT FOR LINUX USERS` section.
-
 ## Contributing
 
 Contributions from the open-source community are welcome. Whether it's fixing a bug, adding a feature, or improving the documentation, your contributions are greatly appreciated. To contribute to **mikupad**, follow these steps:

server/Dockerfile

@@ -1,7 +1,7 @@
 FROM node:20.19.3
 
-COPY project /app/project
 COPY server /app/server
+COPY project /app/project
 COPY mikupad.html /app/mikupad.html
 COPY compile.sh /app/compile.sh
 
@@ -15,4 +15,4 @@ RUN mv /app/mikupad_compiled.html /app/mikupad.html
 # Compile server
 WORKDIR /app/server
 RUN npm install --no-audit
-ENTRYPOINT [ "node", "server.js" ]
+ENTRYPOINT [ "node", "server.js" ]

server/docker-compose.yml

@@ -1,6 +1,8 @@
 services:
   mikupad:
-    build: .
+    build:
+      context: ..
+      dockerfile: server/Dockerfile
     ports:
       - 3000:3000
     env_file:
@@ -10,4 +12,4 @@ services:
       - storage:/storage
 
 volumes:
-  storage:
+  storage: