From 853850f8afd708f9e5e579aa450e0774438ad3c0 Mon Sep 17 00:00:00 2001
From: leca <leca@foxarmy.org>
Date: Fri, 27 Oct 2023 22:21:25 +0300
Subject: [PATCH] Docker changes

---
 Dockerfile           |  5 +----
 docker-compose.yml   | 16 +++++-----------
 docker-entrypoint.sh |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 docker-entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index 4e88db0..d280548 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,9 @@
 FROM node:18
-ARG UID=911
-ARG GID=911
 
 WORKDIR /usr/share/dach
 COPY package*.json ./
 COPY . .
 
 RUN npm install
-USER dach
 EXPOSE 1337
-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["./docker-entrypoint.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 5b0f90f..4bd6f9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,8 +5,8 @@ services:
     image: postgres:12.1-alpine
     container_name: dach_db
     restart: always
-#    healthcheck:
-#      test: ["CMD", "pg_isready", "-U", "dach"]
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "dach"]
     env_file:
       - ./db.env
     volumes:
@@ -23,18 +23,12 @@ services:
     restart: always
     ports:
       - '1337:1337'
+      - '1488:1488'
     build:
       context: .
-
-      # Feel free to remove or override this section
-      # See 'Build-time variables' in README.md
-      args:
-        - "UID=911"
-        - "GID=911"
-#    volumes:
-#      - ./uploads:/var/lib/pleroma/uploads
     env_file:
       - ./web.env
     depends_on:
-      - db
+      db:
+        condition: service_started
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
old mode 100644
new mode 100755
index d69dfd7..311d030
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-npm start
\ No newline at end of file
+npm start