From a9e4f51e1cbd7894a0baedf859d28c8af3301785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=8E=B7=F0=9F=90=A2=20S=2E=20P=2E=20O=2E=20Clayton?=
 <yo@sean.wtf>
Date: Mon, 20 Jun 2022 13:54:54 -0400
Subject: [PATCH] Use 1.16.8 and use env vars for gitea config

---
 gitea.yaml       | 22 +++++++++++++++++++---
 gitea/Dockerfile |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gitea.yaml b/gitea.yaml
index 7c05193..5bd9ad1 100755
--- a/gitea.yaml
+++ b/gitea.yaml
@@ -45,7 +45,7 @@
 
     - name: Build Gitea image
       docker_image:
-        name: gitea_with_asciidoc
+        name: gitea
         source: build
         build:
           path: "./gitea"
@@ -54,8 +54,8 @@
       docker_container:
         name: "{{ stack_prefix_name }}gitea"
         recreate: true
-        restart_policy: unless-stopped
-        image: gitea/gitea:1.16.8
+        restart_policy: always
+        image: gitea
         published_ports:
           - "3000:3000"
         env:
@@ -83,11 +83,27 @@
           "GITEA__server__LFS_CONTENT_PATH": /app/gitea/data/lfs
           "GITEA__server__LFS_JWT_SECRET": "{{ secret_gitea_lfs_jwt_secret }}"
           "GITEA__server__OFFLINE_MODE": "false"
+          "GITEA__service__REGISTER_EMAIL_CONFIRM": "false"
+          "GITEA__service__ENABLE_NOTIFY_MAIL": "false"
+          "GITEA__service__DISABLE_REGISTRATION": "true"
+          "GITEA__service__ALLOW_ONLY_EXTERNAL_REGISTRATION": "false"
+          "GITEA__service__ENABLE_CAPTCHA": "false"
+          "GITEA__service__REQUIRE_SIGNIN_VIEW": "false"
+          "GITEA__service__DEFAULT_KEEP_EMAIL_PRIVATE": "true"
+          "GITEA__service__DEFAULT_ALLOW_CREATE_ORGANIZATION": "true"
+          "GITEA__service__DEFAULT_ENABLE_TIMETRACKING": "true"
+          "GITEA__service__NO_REPLY_ADDRESS": noreply.code.sean.wtf
+          "GITEA__picture__DISABLE_GRAVATAR": "false"
+          "GITEA__picture__ENABLE_FEDERATED_AVATAR": "true"
+          "GITEA__openid__ENABLE_OPENID_SIGNIN": "false"
+          "GITEA__openid__ENABLE_OPENID_SIGNUP": "false"
         networks:
           - name: "{{ stack_internal_network }}"
           - name: "{{ stack_external_network }}"
         # May need to open ssh ports for some things. Maybe not.
         mounts:
+          - source: "{{ stack_prefix_name}}gitea_repositories"
+            target: /app/gitea/data/gitea-repositories
           - source: "{{ stack_prefix_name }}gitea_data"
             target: /data
           - source: /etc/timezone
diff --git a/gitea/Dockerfile b/gitea/Dockerfile
index df6ab99..6667ede 100644
--- a/gitea/Dockerfile
+++ b/gitea/Dockerfile
@@ -1,4 +1,4 @@
-FROM gitea/gitea:1.17.0-rc1
+FROM gitea/gitea:1.16.8
 
 COPY app.ini /data/gitea/conf/app.ini