feat: use hcaptcha environment variable during build

IFRCGo · Nov 29, 2024 · cbe4b1b · cbe4b1b
1 parent a7c2db9
commit cbe4b1b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,6 +33,7 @@ ENV APP_ENVIRONMENT=APP_ENVIRONMENT_PLACEHOLDER
 ENV APP_MAPBOX_ACCESS_TOKEN=APP_MAPBOX_ACCESS_TOKEN_PLACEHOLDER
 ENV APP_GOOGLE_ANALYTICS_ID=APP_GOOGLE_ANALYTICS_ID_PLACEHOLDER
 ENV APP_GRAPHQL_API_ENDPOINT=https://APP-GRAPHQL-API-ENDPOINT-PLACEHOLDER.COM/
+ENV APP_HCAPTCHA_SITEKEY=APP_HCAPTCHA_SITEKEY_PLACEHOLDER
 
 # Build variables (Requires backend pulled)
 ENV APP_GRAPHQL_CODEGEN_ENDPOINT=./backend/schema.graphql

diff --git a/nginx-serve/apply-config.sh b/nginx-serve/apply-config.sh
@@ -30,6 +30,8 @@ find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<APP_ENVIRONMENT_PLACEHOL
 find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<APP_MAPBOX_ACCESS_TOKEN_PLACEHOLDER\>|$APP_MAPBOX_ACCESS_TOKEN|g" {} +
 find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<APP_GOOGLE_ANALYTICS_ID_PLACEHOLDER\>|$APP_GOOGLE_ANALYTICS_ID|g" {} +
 find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<https://APP-GRAPHQL-API-ENDPOINT-PLACEHOLDER.COM/|$APP_GRAPHQL_API_ENDPOINT|g" {} +
+find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<APP_HCAPTCHA_SITEKEY_PLACEHOLDER|$APP_HCAPTCHA_SITEKEY|g" {} +
+
 
 # Show diffs (Useful to debug issues)
 set +xe

diff --git a/nginx-serve/helm/templates/configmap.yaml b/nginx-serve/helm/templates/configmap.yaml
@@ -12,3 +12,4 @@ data:
   APP_MAPBOX_ACCESS_TOKEN: {{ required "env.APP_MAPBOX_ACCESS_TOKEN" .Values.env.APP_MAPBOX_ACCESS_TOKEN | quote }}
   APP_GOOGLE_ANALYTICS_ID: {{ .Values.env.APP_GOOGLE_ANALYTICS_ID | quote }}
   APP_GRAPHQL_API_ENDPOINT: {{ required "env.APP_GRAPHQL_API_ENDPOINT" .Values.env.APP_GRAPHQL_API_ENDPOINT | quote }}
+  APP_HCAPTCHA_SITEKEY: {{ required "env.APP_HCAPTCHA_SITEKEY" .Values.env.APP_HCAPTCHA_SITEKEY | quote }}
diff --git a/nginx-serve/helm/templates/deployment.yaml b/nginx-serve/helm/templates/deployment.yaml
@@ -9,13 +9,13 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: {{ template "ifrcgo-web-app.name" . }}
+      app: {{ template "ifrcgo-web-app.fullname" . }}
       release: {{ .Release.Name }}
       run: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ template "ifrcgo-web-app.name" . }}
+        app: {{ template "ifrcgo-web-app.fullname" . }}
         release: {{ .Release.Name }}
         run: {{ .Release.Name }}
     spec:

diff --git a/nginx-serve/helm/templates/service.yaml b/nginx-serve/helm/templates/service.yaml
@@ -3,13 +3,13 @@ kind: Service
 metadata:
   name: {{ template "ifrcgo-web-app.fullname" . }}-svc
   labels:
-    app: {{ template "ifrcgo-web-app.name" . }}
+    app: {{ template "ifrcgo-web-app.fullname" . }}
     environment: {{ .Values.environment }}
     release: {{ .Release.Name }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ template "ifrcgo-web-app.name" . }}
+    app: {{ template "ifrcgo-web-app.fullname" . }}
     release: {{ .Release.Name }}
     run: {{ .Release.Name }}
   ports:

diff --git a/nginx-serve/helm/values-test.yaml b/nginx-serve/helm/values-test.yaml
@@ -13,3 +13,4 @@ env:
   APP_ENVIRONMENT: ALPHA-1
   APP_MAPBOX_ACCESS_TOKEN: pk.ab.xy
   APP_GRAPHQL_API_ENDPOINT: https://alert-hub-1.ifrc-go.org/graphql/
+    APP_HCAPTCHA_SITEKEY: 
diff --git a/nginx-serve/helm/values.yaml b/nginx-serve/helm/values.yaml
@@ -22,3 +22,4 @@ env:
   APP_MAPBOX_ACCESS_TOKEN:
   APP_GOOGLE_ANALYTICS_ID:
   APP_GRAPHQL_API_ENDPOINT: https://alerthub-api.ifrc.org/graphql/
+  APP_HCAPTCHA_SITEKEY: