Merge pull request #5 from ConductionNL/leiden

Leiden to main

.env

@@ -6,7 +6,7 @@ NPM_REGISTRY=
 NPM_TOKEN=
 VCS_REF=
 VERSION=
-NEXT_PUBLIC_API_URL=https://api.huwelijksplanner.online/api
+NEXT_PUBLIC_API_URL=https://api.leiden-hp.commonground.nu/api
 NEXT_PUBLIC_MATOMO_URL=https://stats.utrecht.nl/analytics/
 NEXT_PUBLIC_MATOMO_SITE_ID=5
 NEXT_PUBLIC_NL_DESIGN_THEME_CLASSNAME=utrecht-theme

Dockerfile

@@ -15,6 +15,9 @@ ARG NODE_ENV
 ARG NPM_REGISTRY
 ARG NPM_STRICT_SSL
 ARG NPM_TOKEN
+ARG NEXT_PUBLIC_API_URL
+
+RUN echo $NEXT_PUBLIC_API_URL
 
 RUN if test "$NODE_ENV" = 'development'; \
 then \
@@ -33,7 +36,7 @@ ADD ./ /var/www/
 RUN if test "$NODE_ENV" != 'development'; \
 then \
     npm config set "//registry.npmjs.org/:_authToken" "${NPM_TOKEN}" \
-    && NODE_ENV=development npm ci --no-update-notifier \
+    && NODE_ENV=development && npm ci --no-update-notifier \
     && npm run build \
     && npm prune \
     && npm config set "//registry.npmjs.org/:_authToken" "" \

docker-compose.yml

@@ -13,8 +13,10 @@ services:
         - "NPM_TOKEN=${NPM_TOKEN}"
         - "VCS_REF=${VCS_REF}"
         - "VERSION=${VERSION}"
+        - "NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}"
       context: .
       dockerfile: ./Dockerfile
     ports:
       - "3000:3000"
     command: "start"
+    image: ghcr.io/conductionnl/huwelijksplanner-utrecht:leiden

helm/huwelijksplanner/templates/deployment.yaml

@@ -29,32 +29,13 @@ spec:
       {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      volumes:
-          - name: tmpfs
-            emptyDir: {}
-          - name: tmpfs2
-            emptyDir: {}
-          - name: env
-            configMap:
-                name: {{ include "api-platform.fullname" . }}
-                items:
-                    - key: "properties"
-                      path: "env.js"
 
       containers:
         - name: {{ .Chart.Name }}-pwa
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.pwa.image.image }}:{{ .Values.pwa.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.pwa.image.pullPolicy }}
-          volumeMounts:
-              -   name: env
-                  mountPath: "/usr/share/nginx/html/env.js"
-                  subPath: "env.js"
-              -   mountPath: /var/cache/nginx/client_temp
-                  name: tmpfs
-              -   mountPath: /var/run
-                  name: tmpfs2
           ports:
             - name: http
               containerPort: 3000

helm/huwelijksplanner/templates/service.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "api-platform.fullname" . }}
+  labels:
+    {{- include "api-platform.labelsPWA" . | nindent 4 }}
+spec:
+  ports:
+    - port: 80
+      targetPort: 3000
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "api-platform.selectorLabelsPWA" . | nindent 4 }}