From ab4f222e92a693ecbc6c465dc82025941ee6a6f2 Mon Sep 17 00:00:00 2001
From: Sylvain Huguet <sylvain@huguet.me>
Date: Sun, 31 Mar 2024 11:18:03 +0200
Subject: [PATCH] Add support for self-hosting in Docker

---
 .dockerignore      |  2 ++
 .gitignore         |  4 +++-
 Dockerfile         | 10 ++++++----
 docker-compose.yml | 28 +++++++++++++++++++++++-----
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index a9c8231f..74df5ffb 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,5 @@
 .dockerignore
 Dockerfile
 node_modules
+config
+data
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 6988d808..f0e514d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,6 @@ dist/
 .vscode/
 .env
 # this is for jetbrain IDEs
-.idea/
\ No newline at end of file
+.idea/
+config
+data
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a33734e9..e19bafbe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,10 @@ FROM node:21-alpine
 # Set labels
 LABEL repo="https://github.com/HeyPuter/puter"
 LABEL license="AGPL-3.0,https://github.com/HeyPuter/puter/blob/master/LICENSE.txt"
-LABEL version="v1.2.40-beta"
+LABEL version="1.2.46-beta-1"
 
-# Debugging
-RUN apk add --no-cache bash # useful for debugging
+# Install git (required by Puter to check version)
+RUN apk add --no-cache git
 
 # Setup working directory
 RUN mkdir -p /opt/puter/app
@@ -24,7 +24,9 @@ USER node
 RUN npm cache clean --force \
     && npm install
 
-EXPOSE 4000
+EXPOSE 4100
 
+HEALTHCHECK  --interval=5m --timeout=3s \
+  CMD wget --no-verbose --tries=1 --spider http://localhost:4100/ || exit 1
 
 CMD [ "npm", "start" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 47dc2947..c605748a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,25 @@
-version: '3'
-
+---
+version: "3.8"
 services:
-  app:
-    build: ./
+  puter:
+    container_name: puter
+    image: ghcr.io/heyputer/puter:latest
+    pull_policy: always
+    # build: ./
+    restart: unless-stopped
     ports:
-      - 4000:4000    
+      - '4100:4100'
+    environment:
+      # TZ: Europe/Paris
+      # CONFIG_PATH: /etc/puter
+      PUID: 1000
+      PGID: 1000
+    volumes:
+      - ./config:/opt/puter/app/volatile/config
+      - ./data:/opt/puter/app/volatile/runtime
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://localhost:4100 || exit 1
+      interval: 5m
+      timeout: 3s
+      retries: 3
+      start_period: 2m
\ No newline at end of file