From 7340aa93dadc654bc3b7f67df02849e66aaa9108 Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Fri, 18 Nov 2022 19:05:58 +0000
Subject: [PATCH] fix: fixed templating of the services

---
 .helpers/render.sh                    |  2 +-
 templates/compose/docker-compose.yaml | 28 +++++++++------------------
 templates/gitea/Dockerfile            | 20 +++++--------------
 templates/gitea/app.ini               |  4 ++--
 templates/traefik/traefik.yaml        |  3 ++-
 5 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/.helpers/render.sh b/.helpers/render.sh
index 79dcf0d..7d9952b 100644
--- a/.helpers/render.sh
+++ b/.helpers/render.sh
@@ -6,7 +6,7 @@ set -o pipefail
 
 directory=$1
 
-export $(xargs < ./config/production.cfg)
+export $(xargs < ./config/flow-platform.cfg)
 mkdir -p build/${directory}
 
 for i in $(find "./templates/${directory}" -mindepth 1 -type f); do
diff --git a/templates/compose/docker-compose.yaml b/templates/compose/docker-compose.yaml
index 499cf40..cf8320b 100644
--- a/templates/compose/docker-compose.yaml
+++ b/templates/compose/docker-compose.yaml
@@ -1,9 +1,9 @@
 ---
-version: "3.8"
+version: "3.9"
 
 networks:
-  forge:
-    name: "forge-flow"
+  flow:
+    name: "flow"
     ipam:
       driver: "default"
       config:
@@ -17,12 +17,11 @@ services:
   # -- Traffic flow --
   traefik:
     container_name: "traffic-flow"
+    image: flow-traefik
     build:
-      args:
-        TRAEFIK_VERSION: "${TRAEFIK_VERSION}"
-      context: "./traefik"
+      context: "../traefik"
     networks:
-      forge:
+      flow:
         ipv4_address: "${TRAEFIK_CONTAINER_IPV4_ADDRESS}"
     ports:
     - target: 80
@@ -57,23 +56,14 @@ services:
   # -- Code flow --
   gitea:
     container_name: "code-flow"
+    image: flow-gitea
     build:
-      args:
-        FLOW_GID: "${FLOW_GID}"
-        FLOW_UID: "${FLOW_UID}"
-        GITEA_HOME: "${GITEA_HOME}"
-        GITEA_WORK_DIR: "${GITEA_WORK_DIR}"
-        GITEA_CUSTOM: "${GITEA_CUSTOM}"
-        GITEA_APP_INI: "${GITEA_APP_INI}"
-        GITEA_BIN: "${GITEA_BIN}"
-        GITEA_DATA_CONTAINER_DIR: "${GITEA_DATA_CONTAINER_DIR}"
-        GITEA_TMP: "${GITEA_TMP}"
-      context: "./gitea"
+      context: "../gitea"
     expose:
     - "${GITEA_SSH_PORT}"
     - "${GITEA_HTTP_PORT}"
     networks:
-      forge:
+      flow:
         ipv4_address: "${GITEA_CONTAINER_IPV4_ADDRESS}"
     restart: "always"
     volumes:
diff --git a/templates/gitea/Dockerfile b/templates/gitea/Dockerfile
index 539ba6d..c758056 100644
--- a/templates/gitea/Dockerfile
+++ b/templates/gitea/Dockerfile
@@ -1,16 +1,6 @@
 # This is a custom made Dockerfile for Gitea which is inspired from
 # the official Dockerfile.rootless from https://github.com/go-gitea/gitea/
-FROM alpine:3.15.0
-
-ARG FLOW_UID
-ARG FLOW_GID
-ARG GITEA_HOME
-ARG GITEA_WORK_DIR
-ARG GITEA_CUSTOM
-ARG GITEA_APP_INI
-ARG GITEA_BIN
-ARG GITEA_DATA_CONTAINER_DIR
-ARG GITEA_TMP
+FROM alpine:3.16
 
 RUN apk --no-cache add \
     bash \
@@ -22,7 +12,7 @@ RUN apk --no-cache add \
     openssh-keygen
 
 RUN addgroup -S -g ${FLOW_GID} flow && \
-    adduser -S -H -D -h ${GITEA_HOME} -s /bin/bash -u ${FLOW_UID} -G flow git && \
+    adduser -S -H -D -h ${GITEA_HOME} -s /bin/bash -u ${GITEA_FLOW_UID} -G flow git && \
     mkdir -p ${GITEA_DATA_CONTAINER_DIR} ${GITEA_TMP} && \
     chown git ${GITEA_DATA_CONTAINER_DIR} && chmod 0700 ${GITEA_DATA_CONTAINER_DIR} && \
     chown git ${GITEA_TMP} && chmod 0700 ${GITEA_TMP}
@@ -30,9 +20,9 @@ RUN addgroup -S -g ${FLOW_GID} flow && \
 ADD --chown=root:root gitea ${GITEA_BIN}
 ADD app.ini ${GITEA_APP_INI}
 ADD entrypoint.sh /usr/local/bin/entrypoint.sh
-ADD --chown=${FLOW_UID}:${FLOW_GID} dynamic_git.yaml ${GITEA_TMP}/
+ADD --chown=${GITEA_FLOW_UID}:${FLOW_GID} dynamic_git.yaml ${GITEA_TMP}/
 
-RUN chown -R ${FLOW_UID}:${FLOW_UID} ${GITEA_APP_INI} && \
+RUN chown -R ${GITEA_FLOW_UID}:${GITEA_FLOW_UID} ${GITEA_APP_INI} && \
     chmod 0400 ${GITEA_APP_INI} && \
     chmod a+x ${GITEA_BIN} && \
     chmod a+rx /usr/local/bin/entrypoint.sh
@@ -43,7 +33,7 @@ ENV GITEA_WORK_DIR=${GITEA_WORK_DIR} \
     GITEA_BIN=${GITEA_BIN} \
     HOME=${GITEA_HOME}
 
-USER ${FLOW_UID}:${FLOW_GID}
+USER ${GITEA_FLOW_UID}:${FLOW_GID}
 
 WORKDIR /flow/gitea/data
 
diff --git a/templates/gitea/app.ini b/templates/gitea/app.ini
index 1df0f40..8b984d8 100644
--- a/templates/gitea/app.ini
+++ b/templates/gitea/app.ini
@@ -1,4 +1,4 @@
-APP_NAME = ${GITEA_APP_NAME}
+APP_NAME = "${GITEA_APP_NAME_01} ${GITEA_APP_NAME_02}"
 RUN_USER = git
 RUN_MODE = ${GITEA_RUN_MODE}
 
@@ -67,7 +67,7 @@ INSTALL_LOCK        = true
 SECRET_KEY          = ${GITEA_SECRET_KEY}
 INTERNAL_TOKEN      = ${GITEA_INTERNAL_TOKEN}
 LOGIN_REMEMBER_DAYS = 1
-MIN_PASSWORD_LENGTH = 12
+MIN_PASSWORD_LENGTH = 16
 PASSWORD_COMPLEXITY = lower,upper,digit
 
 [service]
diff --git a/templates/traefik/traefik.yaml b/templates/traefik/traefik.yaml
index 339f751..3b5cc97 100644
--- a/templates/traefik/traefik.yaml
+++ b/templates/traefik/traefik.yaml
@@ -26,10 +26,11 @@ providers:
 certificatesResolvers:
   resolver:
     acme:
-      caServer: "${TRAEFIK_ACME_CA_SERVER}"
       email: "${TRAEFIK_ACME_EMAIL}"
       storage: "${TRAEFIK_TLS_CONTAINER_DIR}/acme.json"
       keyType: "RSA4096"
       tlsChallenge: {}
 log:
   level: "${TRAEFIK_LOG_LEVEL}"
+pilot:
+  token: "${TRAEFIK_PILOT_TOKEN}"