From 8f0314899ec3ec8feb45308b68beaa066f4b7563 Mon Sep 17 00:00:00 2001
From: asmigiel <asmigiel@egnyte.com>
Date: Mon, 6 Jan 2025 18:46:02 +0100
Subject: [PATCH] test

---
 Dockerfile   | 28 +++++++++++++++++------
 conf/app.ini |  0
 heroku.yml   | 21 +++++++++++++-----
 run.sh       | 63 +++++++++++++++++++++++++++++++++-------------------
 4 files changed, 77 insertions(+), 35 deletions(-)
 create mode 100644 conf/app.ini

diff --git a/Dockerfile b/Dockerfile
index ada95b3..78d1e9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,25 @@
-FROM gitea/gitea:1.14.5
+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
 
-WORKDIR /app
+USER 1000:1000
 
-COPY run.sh ./
+CMD ["/usr/local/bin/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 run.sh ./
+#
+#ENV GITEA_CUSTOM=/var/lib/gitea/custom
+#
+#RUN chmod +x ./run.sh
+#
+#ENTRYPOINT ["./run.sh"]
diff --git a/conf/app.ini b/conf/app.ini
new file mode 100644
index 0000000..e69de29
diff --git a/heroku.yml b/heroku.yml
index 5fbf931..63383fa 100644
--- a/heroku.yml
+++ b/heroku.yml
@@ -2,11 +2,22 @@ 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
+
+
+#setup:
+#  addons:
+#    - plan: heroku-postgresql
+#      as: DATABASE
+##  config:
+##    POSTGRES_USER: "gitea"
+##    POSTGRES_PASSWORD: "gitea"
+##    POSTGRES_DB: "gitea"
+#
+#build:
+#  docker:
+#    web: Dockerfile
diff --git a/run.sh b/run.sh
index 7f3dae9..851c394 100644
--- a/run.sh
+++ b/run.sh
@@ -1,28 +1,45 @@
-#!/bin/bash
-
-
-
-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
-
+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
\ No newline at end of file
+/usr/local/bin/gitea web -port $PORT
+
+
+
+##!/bin/bash
+#
+#
+#
+#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