From 8d71c4bf3295e3eb87bbd9d01fa6920c9d32eaa3 Mon Sep 17 00:00:00 2001
From: asmigiel <asmigiel@egnyte.com>
Date: Sat, 4 Jan 2025 22:42:34 +0100
Subject: [PATCH] revert

---
 Dockerfile | 23 +++++++----------------
 heroku.yml | 24 +++++++++---------------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b0f8f02..ada95b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,11 @@
-#FROM gitea/gitea:1.14.5
-#
-#WORKDIR /app
-#
-#COPY run.sh ./
-#
-#ENV GITEA_CUSTOM=/var/lib/gitea/custom
-#
-#RUN chmod +x ./run.sh
-#
-#ENTRYPOINT ["./run.sh"]
-
-
 FROM gitea/gitea:1.14.5
 
+WORKDIR /app
 
-COPY ./data /var/lib/gitea
-COPY ./config /etc/gitea
+COPY run.sh ./
 
-EXPOSE 3000 2222
+ENV GITEA_CUSTOM=/var/lib/gitea/custom
+
+RUN chmod +x ./run.sh
+
+ENTRYPOINT ["./run.sh"]
diff --git a/heroku.yml b/heroku.yml
index d33e58e..5fbf931 100644
--- a/heroku.yml
+++ b/heroku.yml
@@ -1,18 +1,12 @@
+setup:
+  addons:
+    - plan: heroku-postgresql
+      as: DATABASE
+#  config:
+#    POSTGRES_USER: "gitea"
+#    POSTGRES_PASSWORD: "gitea"
+#    POSTGRES_DB: "gitea"
+
 build:
   docker:
     web: Dockerfile
-
-run:
-  web: /usr/bin/entrypoint /bin/s6-svscan /etc/s6
-
-addons:
-  - plan: heroku-postgresql
-    as: DATABASE
-
-env:
-  GITEA__database__DB_TYPE: postgres
-  GITEA__database__HOST: ${DATABASE_URL}
-  GITEA__database__NAME: gitea
-  GITEA__database__USER: gitea
-  GITEA__database__PASSWD: gitea
-