From a3bb5db8a1267e143f043073f5fe8a77c4c021ef Mon Sep 17 00:00:00 2001
From: asmigiel <asmigiel@egnyte.com>
Date: Sat, 4 Jan 2025 22:36:40 +0100
Subject: [PATCH] test no sh

---
 Dockerfile   | 28 +++++++++++++++++----------
 conf/app.ini |  0
 heroku.yml   | 23 ++++++++++++----------
 run.sh       | 54 ++++++++++++++++++----------------------------------
 4 files changed, 50 insertions(+), 55 deletions(-)
 delete mode 100644 conf/app.ini

diff --git a/Dockerfile b/Dockerfile
index 419b504..b0f8f02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,20 @@
-FROM gitea/gitea:1.14.5-rootless
-ARG DATABASE_URL
-ENV DATABASE_URL=${DATABASE_URL}
-COPY --chown=root:root run.sh /usr/local/bin/
-ADD conf/ /var/lib/gitea/custom/conf/
-USER root
-RUN chmod 755 /usr/local/bin/run.sh
-RUN chmod a+rwx /var/lib/gitea/custom/conf/app.ini
+#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"]
 
-USER 1000:1000
 
-CMD ["/usr/local/bin/run.sh"]
\ No newline at end of file
+FROM gitea/gitea:1.14.5
+
+
+COPY ./data /var/lib/gitea
+COPY ./config /etc/gitea
+
+EXPOSE 3000 2222
diff --git a/conf/app.ini b/conf/app.ini
deleted file mode 100644
index e69de29..0000000
diff --git a/heroku.yml b/heroku.yml
index 165dd22..d33e58e 100644
--- a/heroku.yml
+++ b/heroku.yml
@@ -1,15 +1,18 @@
-setup:
-  addons:
-    - plan: heroku-postgresql
-      as: DATABASE
-#  config:
-#    POSTGRES_USER: "gitea"
-#    POSTGRES_PASSWORD: "gitea"
-#    POSTGRES_DB: "gitea"
-
 build:
   docker:
     web: Dockerfile
 
 run:
-  web: /usr/local/bin/run.sh
+  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
+
diff --git a/run.sh b/run.sh
index 6f4c5cf..7f3dae9 100644
--- a/run.sh
+++ b/run.sh
@@ -2,43 +2,27 @@
 
 
 
+echo $APP_URL
+echo DATABASE_URL
+echo $DATABASE_URL
+
 HOST=`echo $DATABASE_URL | grep -o "@.*/" | sed 's/.$//' | cut -c 2-`
 NAME=`echo $DATABASE_URL | grep -o "/[[:alnum:]]*$" | cut -c 2-`
 USER=`echo $DATABASE_URL | grep -o "//[[:alnum:]]*:" | grep -o "[[:alnum:]]*"`
 PASSWD=`echo $DATABASE_URL | grep -o ":[[:alnum:]]*@" | grep -o "[[:alnum:]]*"`
-printf "[server]\nHTTP_PORT = $PORT;\n" > /var/lib/gitea/custom/conf/app.ini
-printf "DOMAIN = $HEROKU_APP_DEFAULT_DOMAIN_NAME\n" >> /var/lib/gitea/custom/conf/app.ini
-printf "\n[database]\nDB_TYPE = postgres;\n" >> /var/lib/gitea/custom/conf/app.ini
-printf "NAME = $NAME;\n" >> /var/lib/gitea/custom/conf/app.ini
-printf "HOST = $HOST;\n" >> /var/lib/gitea/custom/conf/app.ini
-printf "USER = $USER;\n" >> /var/lib/gitea/custom/conf/app.ini
-printf "PASSWD = $PASSWD;\n" >> /var/lib/gitea/custom/conf/app.ini
-printf "SSL_MODE=require ;\n" >> /var/lib/gitea/custom/conf/app.ini
-cat /var/lib/gitea/custom/conf/app.ini
-/usr/local/bin/gitea web -port $PORT
 
-#
-#echo $APP_URL
-#echo DATABASE_URL
-#echo $DATABASE_URL
-#
-#HOST=`echo $DATABASE_URL | grep -o "@.*/" | sed 's/.$//' | cut -c 2-`
-#NAME=`echo $DATABASE_URL | grep -o "/[[:alnum:]]*$" | cut -c 2-`
-#USER=`echo $DATABASE_URL | grep -o "//[[:alnum:]]*:" | grep -o "[[:alnum:]]*"`
-#PASSWD=`echo $DATABASE_URL | grep -o ":[[:alnum:]]*@" | grep -o "[[:alnum:]]*"`
-#
-#mkdir -p /var/lib/gitea/custom/conf
-#
-#echo "[server]" > /var/lib/gitea/custom/conf/app.ini
-#echo "ROOT_URL = $APP_URL" >> /var/lib/gitea/custom/conf/app.ini
-#
-#echo "[database]" >> /var/lib/gitea/custom/conf/app.ini
-#echo "DB_TYPE = postgres" >> /var/lib/gitea/custom/conf/app.ini
-#echo "HOST = $HOST" >> /var/lib/gitea/custom/conf/app.ini
-#echo "NAME = $NAME" >> /var/lib/gitea/custom/conf/app.ini
-#echo "USER = $USER" >> /var/lib/gitea/custom/conf/app.ini
-#echo "PASSWD = $PASSWD" >> /var/lib/gitea/custom/conf/app.ini
-#echo "SSL_MODE = require" >> /var/lib/gitea/custom/conf/app.ini
-#
-#cat /var/lib/gitea/custom/conf/app.ini
-#/usr/local/bin/gitea web --port $PORT
\ No newline at end of file
+mkdir -p /var/lib/gitea/custom/conf
+
+echo "[server]" > /var/lib/gitea/custom/conf/app.ini
+echo "ROOT_URL = $APP_URL" >> /var/lib/gitea/custom/conf/app.ini
+
+echo "[database]" >> /var/lib/gitea/custom/conf/app.ini
+echo "DB_TYPE = postgres" >> /var/lib/gitea/custom/conf/app.ini
+echo "HOST = $HOST" >> /var/lib/gitea/custom/conf/app.ini
+echo "NAME = $NAME" >> /var/lib/gitea/custom/conf/app.ini
+echo "USER = $USER" >> /var/lib/gitea/custom/conf/app.ini
+echo "PASSWD = $PASSWD" >> /var/lib/gitea/custom/conf/app.ini
+echo "SSL_MODE = require" >> /var/lib/gitea/custom/conf/app.ini
+
+cat /var/lib/gitea/custom/conf/app.ini
+/usr/local/bin/gitea web --port $PORT
\ No newline at end of file