From cb5326601f12174cafb46451656e088b88529463 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 1 Jun 2025 23:58:15 -0500
Subject: [PATCH] Switch to rootless and verify with podman-compose

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
---
 compose.yml | 81 ++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/compose.yml b/compose.yml
index 3d0e01f..a940a20 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,61 +1,58 @@
+---
 version: "3"
 networks:
-  common:
+  gitea:
+    external: false
 services:
   gitea:
     depends_on:
-      - "mariadb"
+      - "mysql"
     environment:
       APP_NAME: "Fire Dragon GIT Repository"
-      DB_HOST: "mariadb:3306"
-      DB_NAME: "gitea"
-      DB_PASSWD: "SecretSquirrel"
-      DB_TYPE: "mysql"
-      DB_USER: "gitea"
-      HTTP_PORT: "3000"
-      LFS_START_SERVER: "true"
-      RUN_MODE: "prod"
-      SSH_DOMAIN: "SecretSquirrel"
-      SSH_LISTEN_PORT: "4000"
-      SSH_PORT: "4000"
-    image: "docker.io/gitea/gitea:latest"
+      GITEA__database__DB_TYPE: "mysql"
+      GITEA__database__HOST: "mysq:3306"
+      GITEA__database__NAME: "gitea"
+      GITEA__database__USER: "gitea"
+      GITEA__database__PASSWD: "SecretSquirrel"
+      GITEA__server__LFS_START_SERVER: "true"
+      GITEA__server__HTTP_PORT: "3000"
+      GITEA__server__PROTOCOL: "http"
+      GITEA__server__START_SSH_SERVER: "true"
+      GITEA__server__SSH_PORT: "4000"
+      GITEA__server__SSH_LISTEN_PORT: "4000"
+    image: "docker.gitea.com/gitea:1.23-rootless"
+    expose:
+      - "3000"
+      - "4000"
     networks:
-      - "common"
+      - "gitea"
     ports:
-      - "127.0.0.1:3000:3000"
-      - "127.0.0.1:4000:4000"
+      - "3000:3000"
+      - "4000:4000"
     restart: "always"
     volumes:
-      - "gitea:/data"
-  mariadb:
+      - "gitea_config:/etc/gitea"
+      - "gitea_data:/var/lib/gitea"
+  mysql:
     environment:
-      MARIADB_DATABASE: "gitea"
-      MARIADB_PASSWORD: "SecretSquirrel"
-      MARIADB_ROOT_PASSWORD: "SuperSecretSquirrel"
-      MARIADB_USER: "gitea"
+      MYSQL_DATABASE: "gitea"
+      MYSQL_PASSWORD: "SecretSquirrel"
+      MYSQL_ROOT_PASSWORD: "SuperSecretSquirrel"
+      MYSQL_USER: "gitea"
     expose:
       - "3306"
-    image: "docker.io/mariadb:latest"
+    image: "container-registry.oracle.com/mysql/community-server:9.3"
     networks:
-      - "common"
+      - "gitea"
     restart: "always"
     volumes:
-      - "mariadb:/var/lib/mysql"
-  phpmyadmin:
-    depends_on:
-      - "mariadb"
-    environment:
-      PMA_HOST: "mariadb"
-      PHA_PORT: "3306"
-      PMA_USER: "gitea"
-      PMA_PASSWORD: "SecretSquirrel"
-    image: "docker.io/phpmyadmin/phpmyadmin:fpm-alpine"
-    networks:
-      - "common"
-    ports:
-      - "127.0.0.1:5000:80"
-    restart: "always"
+      - "gitea_mysql:/var/lib/mysql"
 volumes:
-  gitea:
-  mariadb:
+  gitea_data:
+    driver: "local"
+  gitea_config:
+    driver: "local"
+  gitea_mysql:
+    driver: "local"
+...