fix(charterafrica): align Payload build secrets

.github/workflows/_build-charterafrica.yml

@@ -40,7 +40,7 @@ on:
         required: false
       DATABASE_URL:
         required: false
-      PAYLOAD_SECRET_KEY:
+      PAYLOAD_SECRET:
         required: false
       NEXT_PUBLIC_SENTRY_DSN:
         required: false
@@ -72,7 +72,7 @@ jobs:
       DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
       DOCKER_HUB_ACCESS_TOKEN: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       DATABASE_URL: ${{ secrets.DATABASE_URL }}
-      PAYLOAD_SECRET_KEY: ${{ secrets.PAYLOAD_SECRET_KEY }}
+      PAYLOAD_SECRET: ${{ secrets.PAYLOAD_SECRET }}
       NEXT_PUBLIC_SENTRY_DSN: ${{ secrets.NEXT_PUBLIC_SENTRY_DSN }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       SENTRY_ORG: ${{ secrets.SENTRY_ORG }}

.github/workflows/charterafrica-deploy-dev.yml

@@ -66,8 +66,8 @@ jobs:
           platforms: linux/arm64
           push: true
           secrets: |
-            "mongo_url=${{ secrets.CHARTERAFRICA_MONGO_URL }}"
-            "payload_secret_key=${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}"
+            "database_url=${{ secrets.CHARTERAFRICA_MONGO_URL }}"
+            "payload_secret=${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}"
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"
             "sentry_org=${{ secrets.SENTRY_ORG }}"
             "sentry_project=${{ secrets.CHARTERAFRICA_SENTRY_PROJECT }}"

.github/workflows/charterafrica-deploy-prod.yml

@@ -91,8 +91,8 @@ jobs:
           platforms: linux/amd64
           push: true
           secrets: |
-            "mongo_url=${{ secrets.CHARTERAFRICA_MONGO_URL }}"
-            "payload_secret_key=${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}"
+            "database_url=${{ secrets.CHARTERAFRICA_MONGO_URL }}"
+            "payload_secret=${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}"
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"
             "sentry_org=${{ secrets.SENTRY_ORG }}"
             "sentry_project=${{ secrets.CHARTERAFRICA_SENTRY_PROJECT }}"

.github/workflows/charterafrica.yml

@@ -72,7 +72,7 @@ jobs:
       DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
       DOCKER_HUB_ACCESS_TOKEN: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       DATABASE_URL: ${{ secrets.CHARTERAFRICA_MONGO_URL }}
-      PAYLOAD_SECRET_KEY: ${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}
+      PAYLOAD_SECRET: ${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}
       NEXT_PUBLIC_SENTRY_DSN: ${{ secrets.CHARTERAFRICA_SENTRY_DSN }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
@@ -114,7 +114,7 @@ jobs:
       DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
       DOCKER_HUB_ACCESS_TOKEN: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       DATABASE_URL: ${{ secrets.CHARTERAFRICA_MONGO_URL }}
-      PAYLOAD_SECRET_KEY: ${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}
+      PAYLOAD_SECRET: ${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}
       NEXT_PUBLIC_SENTRY_DSN: ${{ secrets.CHARTERAFRICA_SENTRY_DSN }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       SENTRY_ORG: ${{ secrets.SENTRY_ORG }}

.github/workflows/pr-build.yml

@@ -131,7 +131,7 @@ jobs:
       # apps — PR builds need a genuinely reachable database, not a dummy
       # value.
       DATABASE_URL: ${{ secrets.CHARTERAFRICA_MONGO_URL }}
-      PAYLOAD_SECRET_KEY: pr-build-unused
+      PAYLOAD_SECRET: pr-build-unused
       NEXT_PUBLIC_SENTRY_DSN: pr-build-unused
       SENTRY_AUTH_TOKEN: pr-build-unused
       SENTRY_ORG: pr-build-unused

Dockerfile

@@ -204,8 +204,8 @@ COPY apps/charterafrica ./apps/charterafrica/
 # When building Next.js app, Next.js needs to connect to local Payload
 ENV PAYLOAD_PUBLIC_APP_URL=http://localhost:3000
 ENV NEXT_PUBLIC_SEO_DISABLED=${NEXT_PUBLIC_SEO_DISABLED}
-RUN --mount=type=secret,id=mongo_url,env=MONGO_URL \
-  --mount=type=secret,id=payload_secret_key,env=PAYLOAD_SECRET_KEY \
+RUN --mount=type=secret,id=database_url,env=DATABASE_URL \
+  --mount=type=secret,id=payload_secret,env=PAYLOAD_SECRET \
   --mount=type=secret,id=sentry_auth_token,env=SENTRY_AUTH_TOKEN \
   --mount=type=secret,id=sentry_org,env=SENTRY_ORG \
   --mount=type=secret,id=sentry_project,env=SENTRY_PROJECT \

apps/charterafrica/.env.template

@@ -5,7 +5,7 @@ DATABASE_URL
 PAYLOAD_CORS
 PAYLOAD_CSRF
 PAYLOAD_PUBLIC_APP_URL
-PAYLOAD_SECRET_KEY
+PAYLOAD_SECRET
 
 
 S3_ACCESS_KEY_ID=

apps/charterafrica/README.md

@@ -7,7 +7,7 @@ This is the official code for https://charter.africa site
 First create `.env.local` file in the root directory of the project.
 
 ```bash
-cp env.template .env.local
+cp .env.template .env.local
 ```
 
 and modify the `.env.local` file according to your needs.

apps/charterafrica/server.ts

@@ -60,7 +60,7 @@ const start = async (): Promise<void> => {
             },
           }
         : undefined),
-      secret: process.env.PAYLOAD_SECRET_KEY,
+      secret: process.env.PAYLOAD_SECRET,
       express: server,
       onInit: (initPayload) => {
         initPayload.logger.info(

apps/charterafrica/turbo.json

@@ -21,7 +21,7 @@
         "PAYLOAD_PUBLIC_APP_URL",
         "PAYLOAD_PUBLIC_DEFAULT_LOCALE",
         "PAYLOAD_PUBLIC_LOCALES",
-        "PAYLOAD_SECRET_KEY",
+        "PAYLOAD_SECRET",
         "PROJECT_ROOT",
         "RESOURCES_SECRET_TOKEN",
         "S3_ACCESS_KEY_ID",
@@ -53,7 +53,7 @@
         "PAYLOAD_PUBLIC_APP_URL",
         "PAYLOAD_PUBLIC_DEFAULT_LOCALE",
         "PAYLOAD_PUBLIC_LOCALES",
-        "PAYLOAD_SECRET_KEY",
+        "PAYLOAD_SECRET",
         "PORT",
         "PUBLIC_CHARTERAFRICA_SENTRY_DSN",
         "RESOURCES_SECRET_TOKEN",

docker-bake.hcl

@@ -198,20 +198,17 @@ target "_payload-app-runner" {
 }
 
 target "charterafrica" {
-  inherits   = ["_app-runner"]
+  inherits   = ["_payload-app-runner"]
   dockerfile = "docker/apps/charterafrica/Dockerfile"
   tags       = ["${REGISTRY}charterafrica:${TAG}"]
   args = {
     NEXT_PUBLIC_APP_URL = "${NEXT_PUBLIC_APP_URL}"
     SENTRY_ENVIRONMENT  = "${SENTRY_ENVIRONMENT}"
   }
-  # sentry_auth_token/org/project are inherited from _app. database_url,
-  # payload_secret_key, and next_public_sentry_dsn are charterafrica-specific
-  # — it reads PAYLOAD_SECRET_KEY (not PAYLOAD_SECRET like _payload-app-runner
-  # provides), so this declares its own secret list rather than inheriting it.
+  # sentry_auth_token/org/project are inherited from _app.
+  # database_url and payload_secret are inherited from _payload-app-runner.
+  # next_public_sentry_dsn is charterafrica-specific
   secret = [
-    "type=env,id=database_url,env=DATABASE_URL",
-    "type=env,id=payload_secret_key,env=PAYLOAD_SECRET_KEY",
     "type=env,id=next_public_sentry_dsn,env=NEXT_PUBLIC_SENTRY_DSN",
   ]
 }

docker/apps/charterafrica/Dockerfile

@@ -43,7 +43,7 @@ ENV PAYLOAD_PUBLIC_APP_URL=http://localhost:3000
 # it stays unlogged without needing a GitHub Variable migration — it's
 # stored as a GitHub Secret today even though DSNs aren't actually sensitive.
 RUN --mount=type=secret,id=database_url,env=DATABASE_URL \
-  --mount=type=secret,id=payload_secret_key,env=PAYLOAD_SECRET_KEY \
+  --mount=type=secret,id=payload_secret,env=PAYLOAD_SECRET \
   --mount=type=secret,id=next_public_sentry_dsn,env=NEXT_PUBLIC_SENTRY_DSN \
   --mount=type=secret,id=sentry_auth_token,env=SENTRY_AUTH_TOKEN \
   --mount=type=secret,id=sentry_org,env=SENTRY_ORG \