From 49a778d12889931af77612d6fe0242231cb7a17c Mon Sep 17 00:00:00 2001
From: Christian Winther <jippignu@gmail.com>
Date: Sun, 11 Feb 2024 02:00:09 +0000
Subject: [PATCH] add CODEOWNERS

---
 .env.docker                                    | 11 +++++++----
 CODEOWNERS                                     | 18 ++++++++++++++++++
 Dockerfile                                     |  2 +-
 .../docker/entrypoint.d/02-check-config.sh     |  2 +-
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 CODEOWNERS

diff --git a/.env.docker b/.env.docker
index 2b1ab66a6..9a27550d1 100644
--- a/.env.docker
+++ b/.env.docker
@@ -18,12 +18,14 @@
 
 # The name/title for your site
 # @see https://docs.pixelfed.org/technical-documentation/config/#app_name-1
+# @dottie/example My Pixelfed Site
 # @dottie/validate required,ne=My Pixelfed Site
-APP_NAME="My Pixelfed Site"
+APP_NAME=
 
 # Application domain used for routing. (e.g., pixelfed.org)
 #
 # @see https://docs.pixelfed.org/technical-documentation/config/#app_domain
+# @dottie/example example.com
 # @dottie/validate required,ne=example.com,fqdn
 APP_DOMAIN="example.com"
 
@@ -368,8 +370,8 @@ DB_USERNAME="pixelfed"
 # Use a site like https://pwgen.io/ to generate it
 #
 # @see https://docs.pixelfed.org/technical-documentation/config/#db_password
-# @dottie/validate required,ne=__CHANGE_ME__
-DB_PASSWORD="__CHANGE_ME__"
+# @dottie/validate required
+DB_PASSWORD=
 
 # @see https://docs.pixelfed.org/technical-documentation/config/#db_database
 # @dottie/validate required
@@ -890,6 +892,7 @@ SESSION_DRIVER="redis"
 # 32 character string, otherwise these encrypted strings will not be safe.
 #
 # @see https://docs.pixelfed.org/technical-documentation/config/#app_key
+# @dottie/validate required
 APP_KEY=
 
 # Prefix for container names (without any dash at the end)
@@ -1226,4 +1229,4 @@ DOCKER_PROXY_LETSENCRYPT_EMAIL="${INSTANCE_CONTACT_EMAIL:?error}"
 # Lets Encrypt staging/test servers for certificate requests.
 #
 # Setting this to any value will change to letsencrypt test servers.
-DOCKER_PROXY_LETSENCRYPT_TEST="1"
+#DOCKER_PROXY_LETSENCRYPT_TEST="1"
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000..69a06cf87
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,18 @@
+# See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+*           @dansup
+
+# Docker related files
+.editorconfig               @jippi @dansup
+.env                        @jippi @dansup
+.env.*                      @jippi @dansup
+.hadolint.yaml              @jippi @dansup
+.shellcheckrc               @jippi @dansup
+/.github/                   @jippi @dansup
+/docker/                    @jippi @dansup
+/tests/                     @jippi @dansup
+docker-compose.migrate.yml  @jippi @dansup
+docker-compose.yml          @jippi @dansup
+goss.yaml                   @jippi @dansup
diff --git a/Dockerfile b/Dockerfile
index 5b6f45426..77bb1da62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ ARG FOREGO_VERSION="0.17.2"
 ARG GOMPLATE_VERSION="v3.11.6"
 
 # See: https://github.com/jippi/dottie
-ARG DOTTIE_VERSION="v0.7.0"
+ARG DOTTIE_VERSION="v0.7.1"
 
 ###
 # PHP base configuration
diff --git a/docker/shared/root/docker/entrypoint.d/02-check-config.sh b/docker/shared/root/docker/entrypoint.d/02-check-config.sh
index bbf7dd768..627960352 100755
--- a/docker/shared/root/docker/entrypoint.d/02-check-config.sh
+++ b/docker/shared/root/docker/entrypoint.d/02-check-config.sh
@@ -17,5 +17,5 @@ for file in "${dot_env_files[@]}"; do
     # which do not (and should not) exists inside the container
     #
     # We disable fixer since its not interactive anyway
-    run-as-current-user dottie validate --file "${file}" --ignore-rule dir,file --no-fix
+    run-as-current-user dottie validate --file "${file}" --ignore-rule dir,file --exclude-prefix APP_KEY --no-fix
 done