fix: PWA config and other minor improvements (#2551)

* fix: typos

* fix: fix from review + from vercel/next.js diff

.github/workflows/ci.yml

@@ -70,4 +70,4 @@ jobs:
         name: Lint Dockerfiles
         uses: hadolint/hadolint-action@v3.1.0
         with:
-            recursive: true
+          recursive: true

api/frankenphp/docker-entrypoint.sh

@@ -2,7 +2,7 @@
 set -e
 
 if [ "$1" = 'frankenphp' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
-	if [ ! -d 'vendor/' ]; then
+	if [ -z "$(ls -A 'vendor/' 2>/dev/null)" ]; then
 		composer install --prefer-dist --no-progress --no-interaction
 	fi
 

compose.prod.yaml

@@ -12,7 +12,7 @@ services:
       MERCURE_SUBSCRIBER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}
 
   pwa:
-     build:
+    build:
       context: ./pwa
       target: prod
 

helm/api-platform/templates/configmap.yaml

@@ -12,3 +12,5 @@ data:
   php-trusted-proxies: "{{ join "," .Values.php.trustedProxies }}"
   mercure-url: "http://{{ include "api-platform.fullname" . }}/.well-known/mercure"
   mercure-public-url: {{ .Values.mercure.publicUrl | default "http://127.0.0.1/.well-known/mercure" | quote }}
+  mercure-extra-directives: {{ .Values.mercure.extraDirectives | quote }}
+  caddy-global-options: {{ .Values.php.caddyGlobalOptions | quote }}

helm/api-platform/templates/deployment.yaml

@@ -85,6 +85,11 @@ spec:
                 secretKeyRef:
                   name: {{ include "api-platform.fullname" . }}
                   key: database-url
+            - name: CADDY_GLOBAL_OPTIONS
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ include "api-platform.fullname" . }}
+                  key: caddy-global-options
             - name: MERCURE_URL
               valueFrom:
                 configMapKeyRef:
@@ -95,6 +100,11 @@ spec:
                 configMapKeyRef:
                   name: {{ include "api-platform.fullname" . }}
                   key: mercure-public-url
+            - name: MERCURE_EXTRA_DIRECTIVES
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ include "api-platform.fullname" . }}
+                  key: mercure-extra-directives
             - name: MERCURE_JWT_SECRET
               valueFrom:
                 secretKeyRef:

helm/api-platform/values.yaml

@@ -18,6 +18,7 @@ php:
     - "10.0.0.0/8"
     - "172.16.0.0/12"
     - "192.168.0.0/16"
+  caddyGlobalOptions: ""
 
 pwa:
   image:

pwa/Dockerfile

@@ -59,6 +59,10 @@ RUN addgroup --system --gid 1001 nodejs; \
 
 COPY --from=builder --link /srv/app/public ./public
 
+# Set the correct permission for prerender cache
+RUN mkdir .next; \
+	chown nextjs:nodejs .next
+
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
 COPY --from=builder --link --chown=1001:1001 /srv/app/.next/standalone ./
@@ -69,6 +73,6 @@ USER nextjs
 EXPOSE 3000
 
 ENV PORT 3000
-ENV HOSTNAME localhost
+ENV HOSTNAME "0.0.0.0"
 
 CMD ["node", "server.js"]