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

---
 Dockerfile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5947c65..e7965ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,15 @@ ENV GITEA_CUSTOM=/var/lib/gitea/custom
 
 COPY app.ini /var/lib/gitea/custom/conf/app.ini
 
-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) \
+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) \
     && DATABASE_PORT=$(echo $DATABASE_URL | cut -d ':' -f 4 | cut -d '/' -f 1) \
-    && GITEA__database__NAME=$(echo $DATABASE_URL | cut -d '/' -f 4) \
-    && GITEA__database__DB_TYPE=postgres
+    && DATABASE_NAME=$(echo $DATABASE_URL | cut -d '/' -f 4) \
+
+ENV GITEA__database__USER=${DATABASE_USER} \
+    GITEA__database__PASSWD=${DATABASE_PASSWORD} \
+    GITEA__database__HOST=${DATABASE_HOST} \
+    GITEA__database__NAME=${DATABASE_NAME} \
+    GITEA__database__DB_TYPE=postgres \
+    GITEA__database__SSL_MODE=require