From d8b5b1d8bc769bbf524410dcc1f18ba283b6c415 Mon Sep 17 00:00:00 2001
From: awieczarek <adamwie12@gmail.com>
Date: Sun, 20 Oct 2024 14:22:56 +0200
Subject: [PATCH] New postgres solution

---
 Dockerfile | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ccd44fa..5947c65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,14 +4,9 @@ ENV GITEA_CUSTOM=/var/lib/gitea/custom
 
 COPY app.ini /var/lib/gitea/custom/conf/app.ini
 
-
-USER root
-RUN chmod a+rwx /var/lib/gitea/custom/conf/app.ini
-
-# Extract the necessary parts from DATABASE_URL and modify the app.ini file in /tmp
-RUN DATABASE_USER=$(echo $DATABASE_URL | cut -d ':' -f 2 | cut -d '/' -f 3) \
-    && DATABASE_PASSWORD=$(echo $DATABASE_URL | cut -d ':' -f 3 | cut -d '@' -f 1) \
-    && DATABASE_HOST=$(echo $DATABASE_URL | cut -d '@' -f 2 | cut -d ':' -f 1) \
+RUN GITEA__database__USER=$(echo $DATABASE_URL | cut -d ':' -f 2 | cut -d '/' -f 3) \
+    && GITEA__database__PASSWD=$(echo $DATABASE_URL | cut -d ':' -f 3 | cut -d '@' -f 1) \
+    && GITEA__database__HOST=$(echo $DATABASE_URL | cut -d '@' -f 2 | cut -d ':' -f 1) \
     && DATABASE_PORT=$(echo $DATABASE_URL | cut -d ':' -f 4 | cut -d '/' -f 1) \
-    && DATABASE_NAME=$(echo $DATABASE_URL | cut -d '/' -f 4) \
-    && printf "[database]\nDB_TYPE  = postgres\nHOST     = $DATABASE_HOST\nNAME     = $DATABASE_NAME\nUSER     = $DATABASE_USER\nPASSWD   = $DATABASE_PASSWORD\nSSL_MODE = require\n" > /var/lib/gitea/custom/conf/app.ini
+    && GITEA__database__NAME=$(echo $DATABASE_URL | cut -d '/' -f 4) \
+    && GITEA__database__DB_TYPE=postgres