From 21b999cfb91f670b874b5ef6c4a2654d4eb80d00 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 06:30:06 +0200
Subject: [PATCH 01/21] docs: add readme

---
 README.md | 41 ++---------------------------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index d58e345..a324408 100644
--- a/README.md
+++ b/README.md
@@ -1,40 +1,3 @@
-<p align="center"><img src="https://statamic.com/assets/branding/Statamic-Logo+Wordmark-Rad.svg" width="400" alt="Statamic Logo" /></p>
+# Statamic in docker on heroku
 
-## About Statamic
-
-Statamic is the flat-first, Laravel + Git powered CMS designed for building beautiful, easy to manage websites.
-
-> **Note:** This repository contains the code for the Statamic application. To contribute to the core package, visit the [Statamic core package repository][cms-repo].
-
-
-## Learning Statamic
-
-Statamic has extensive [documentation][docs]. We dedicate a significant amount of time and energy every day to improving them, so if something is unclear, feel free to open issues for anything you find confusing or incomplete. We are happy to consider anything you feel will make the docs and CMS better.
-
-## Support
-
-We provide official developer support on [Statamic Pro](https://statamic.com/pricing) projects. Community-driven support is available on the [forum](https://statamic.com/forum) and in [Discord][discord].
-
-
-## Contributing
-
-Thank you for considering contributing to Statamic! We simply ask that you review the [contribution guide][contribution] before you open issues or send pull requests.
-
-
-## Code of Conduct
-
-In order to ensure that the Statamic community is welcoming to all and generally a rad place to belong, please review and abide by the [Code of Conduct](https://github.com/statamic/cms/wiki/Code-of-Conduct).
-
-
-## Important Links
-
-- [Statamic Main Site](https://statamic.com)
-- [Statamic Documentation][docs]
-- [Statamic Core Package Repo][cms-repo]
-- [Statamic Migrator](https://github.com/statamic/migrator)
-- [Statamic Discord][discord]
-
-[docs]: https://statamic.dev/
-[discord]: https://statamic.com/discord
-[contribution]: https://github.com/statamic/cms/blob/master/CONTRIBUTING.md
-[cms-repo]: https://github.com/statamic/cms
+Tests how to deploy a php statamic (frankenphp) container on heroku.
\ No newline at end of file

From c183e3abec84ef95d516136aa44b6dcaab7140b2 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 06:34:00 +0200
Subject: [PATCH 02/21] build: add heroku app.json

---
 app.json | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 app.json

diff --git a/app.json b/app.json
new file mode 100644
index 0000000..ce0a2b9
--- /dev/null
+++ b/app.json
@@ -0,0 +1,9 @@
+{
+    "name": "Heroku statamic review apps test",
+    "repository": "https://github.com/rburgstaller/frankenphp-statamic",
+    "env": {},
+    "addons": [],
+    "buildpacks": [],
+    "stack": "container"
+  }
+  
\ No newline at end of file

From 02f83d0dc1832cf0a2889c32cce301812bdbf3a3 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 06:43:20 +0200
Subject: [PATCH 03/21] build: add startup script

---
 .dockerignore                 |  1 +
 Dockerfile                    |  4 ++++
 docker/start-review-container | 24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 docker/start-review-container

diff --git a/.dockerignore b/.dockerignore
index 4da1cec..1d5bb6a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,3 +2,4 @@ Dockerfile*
 docker-compose.yml
 vendor
 tests
+docker/*
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a0ec54e..a0ad38f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,9 +63,13 @@ USER ${USER}
 WORKDIR /app
 
 COPY --chown=$USER:$WWWGROUP . /app
+COPY --chown=$USER:$WWWGROUP docker/start-review-container /usr/local/bin/start-review-container
 
 RUN mkdir -p /app/storage/logs && \
     npm install && \
     npm run build
 
 RUN composer install --no-interaction --no-dev --prefer-dist --optimize-autoloader
+
+
+CMD ["/usr/local/bin/start-review-container"]
diff --git a/docker/start-review-container b/docker/start-review-container
new file mode 100644
index 0000000..e424bbc
--- /dev/null
+++ b/docker/start-review-container
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# here we can add the code to perform the db migration, db setup etc
+php artisan migrate
+php artisan db:seed
+php artisan cache:clear
+
+echo "got port $PORT"
+
+export CADDY_GLOBAL_OPTIONS="http_port $PORT"
+export SERVER_NAME="http://localhost:$PORT"
+
+# check what user and gid we have
+echo "id follows $(id)"
+echo "whoami follows $(whoami)"
+
+# exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
+
+if [ $# -gt 0 ]; then
+  echo "starting custom command $@"
+  exec gosu $WWWUSER "$@"
+else
+  echo "starting entrypoint"
+  exec /usr/local/bin/docker-php-entrypoint --config /etc/caddy/Caddyfile --adapter caddyfile
+fi

From 0369332d7587516fc62824ad14de75ce9d2d76ba Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 06:46:40 +0200
Subject: [PATCH 04/21] fix: ensure that start script is in build context

---
 .dockerignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 1d5bb6a..e2ff740 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
 Dockerfile*
 docker-compose.yml
 vendor
-tests
-docker/*
\ No newline at end of file
+tests
\ No newline at end of file

From 3353f6da5288a5c421267102064c202a3eb22f0d Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 07:15:28 +0200
Subject: [PATCH 05/21] fix: ensure start script can be executed

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index a0ad38f..68c8fd7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,6 +66,7 @@ COPY --chown=$USER:$WWWGROUP . /app
 COPY --chown=$USER:$WWWGROUP docker/start-review-container /usr/local/bin/start-review-container
 
 RUN mkdir -p /app/storage/logs && \
+    chmod 770 /usr/local/bin/start-review-container && \
     npm install && \
     npm run build
 

From 68844e9fe7bb2b099c55e1d34dfd7f03dc60bf67 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 07:22:46 +0200
Subject: [PATCH 06/21] build: add testing tools to container

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 68c8fd7..595a006 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 #
 RUN apt-get update && apt-get install -y \
       gnupg git libnss3-tools \
-      vim  # for testing for now
+      vim net-tools procps  # for testing for now
 
 
 

From bc3e11dc9717da197a7cc10c4b36f8fde50b3ec0 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 07:28:33 +0200
Subject: [PATCH 07/21] fix: try and change server name

---
 docker/start-review-container | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/start-review-container b/docker/start-review-container
index e424bbc..1acd46b 100644
--- a/docker/start-review-container
+++ b/docker/start-review-container
@@ -7,7 +7,7 @@ php artisan cache:clear
 echo "got port $PORT"
 
 export CADDY_GLOBAL_OPTIONS="http_port $PORT"
-export SERVER_NAME="http://localhost:$PORT"
+export SERVER_NAME="http://0.0.0.0:$PORT"
 
 # check what user and gid we have
 echo "id follows $(id)"

From fa0023a1448443d49bb19d1ac37e1f630f37939f Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 07:36:58 +0200
Subject: [PATCH 08/21] build: try to enable debug

---
 docker/start-review-container | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/start-review-container b/docker/start-review-container
index 1acd46b..70f7429 100644
--- a/docker/start-review-container
+++ b/docker/start-review-container
@@ -7,6 +7,7 @@ php artisan cache:clear
 echo "got port $PORT"
 
 export CADDY_GLOBAL_OPTIONS="http_port $PORT"
+export CADDY_SERVER_EXTRA_DIRECTIVES="debug"
 export SERVER_NAME="http://0.0.0.0:$PORT"
 
 # check what user and gid we have

From 8d73b08f1a7a580ac272c9c5fb95508a93cc3ade Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 07:52:14 +0200
Subject: [PATCH 09/21] build: add specific caddyfile

---
 Dockerfile       |  2 ++
 docker/Caddyfile | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 docker/Caddyfile

diff --git a/Dockerfile b/Dockerfile
index 595a006..7b38552 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,9 +64,11 @@ WORKDIR /app
 
 COPY --chown=$USER:$WWWGROUP . /app
 COPY --chown=$USER:$WWWGROUP docker/start-review-container /usr/local/bin/start-review-container
+COPY docker/Caddyfile /etc/caddy/Caddyfile
 
 RUN mkdir -p /app/storage/logs && \
     chmod 770 /usr/local/bin/start-review-container && \
+    chmod 222 /etc/caddy/Caddyfile && \
     npm install && \
     npm run build
 
diff --git a/docker/Caddyfile b/docker/Caddyfile
new file mode 100644
index 0000000..5764309
--- /dev/null
+++ b/docker/Caddyfile
@@ -0,0 +1,58 @@
+{
+	{$CADDY_GLOBAL_OPTIONS}
+	{$CADDY_GLOBAL_OPTIONS2}
+	debug
+
+	frankenphp {
+		#worker /path/to/your/worker.php
+		{$FRANKENPHP_CONFIG}
+	}
+
+	# https://caddyserver.com/docs/caddyfile/directives#sorting-algorithm
+	order mercure after encode
+	order vulcain after reverse_proxy
+	order php_server before file_server
+	order php before file_server
+}
+
+{$CADDY_EXTRA_CONFIG} 
+
+http://localhost:{$PORT:80} {
+	bind 0.0.0.0
+
+	#log {
+	#       # Redact the authorization query parameter that can be set by Mercure
+	#       format filter {
+	#               wrap console
+	#               fields {
+	#                       uri query {
+	#                               replace authorization REDACTED
+	#                       }
+	#               }
+	#       }
+	#}
+
+	root * public/
+	encode zstd br gzip
+
+	# Uncomment the following lines to enable Mercure and Vulcain modules
+	#mercure {
+	#       # Transport to use (default to Bolt)
+	#       transport_url {$MERCURE_TRANSPORT_URL:bolt:///data/mercure.db}
+	#       # Publisher JWT key
+	#       publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
+	#       # Subscriber JWT key
+	#       subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
+	#       # Allow anonymous subscribers (double-check that it's what you want)
+	#       anonymous
+	#       # Enable the subscription API (double-check that it's what you want)
+	#       subscriptions
+	#       # Extra directives
+	#       {$MERCURE_EXTRA_DIRECTIVES}
+	#}
+	#vulcain
+
+	{$CADDY_SERVER_EXTRA_DIRECTIVES}
+
+	php_server
+}

From 31a7b3063a276e980975f8b1c60a379c1f2aa543 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 07:57:04 +0200
Subject: [PATCH 10/21] fix: fix permissions

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7b38552..f73a11b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,6 +51,8 @@ RUN mkdir /.composer && \
 
 RUN chown -R "$USER":${WWWGROUP} /data/caddy && \
     chown -R "$USER":${WWWGROUP} /config/caddy && \
+    chmod 770 /usr/local/bin/start-review-container && \
+    chmod 222 /etc/caddy/Caddyfile && \
     mkdir -p /var/www/.npm && chown -R $USER:$WWWGROUP /var/www/.npm && \
     chown -R $USER:$WWWGROUP /app
 
@@ -67,8 +69,6 @@ COPY --chown=$USER:$WWWGROUP docker/start-review-container /usr/local/bin/start-
 COPY docker/Caddyfile /etc/caddy/Caddyfile
 
 RUN mkdir -p /app/storage/logs && \
-    chmod 770 /usr/local/bin/start-review-container && \
-    chmod 222 /etc/caddy/Caddyfile && \
     npm install && \
     npm run build
 

From 1a9cd8f14c4d9581faa8ba0aecf2ef8bd9736c65 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 08:04:18 +0200
Subject: [PATCH 11/21] build: fix caddy file copy

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f73a11b..4de0ec2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,6 +49,9 @@ RUN mkdir /.composer && \
     chmod -R ugo+rw /.composer && \
     chown -R "$USER" /.composer
 
+COPY docker/Caddyfile /etc/caddy/Caddyfile
+
+
 RUN chown -R "$USER":${WWWGROUP} /data/caddy && \
     chown -R "$USER":${WWWGROUP} /config/caddy && \
     chmod 770 /usr/local/bin/start-review-container && \
@@ -66,7 +69,6 @@ WORKDIR /app
 
 COPY --chown=$USER:$WWWGROUP . /app
 COPY --chown=$USER:$WWWGROUP docker/start-review-container /usr/local/bin/start-review-container
-COPY docker/Caddyfile /etc/caddy/Caddyfile
 
 RUN mkdir -p /app/storage/logs && \
     npm install && \

From 58ee6fc6e78bd7e324e8150be92910e4855efaa9 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 08:08:20 +0200
Subject: [PATCH 12/21] fix: fix copy order

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4de0ec2..9297adc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,6 +50,7 @@ RUN mkdir /.composer && \
     chown -R "$USER" /.composer
 
 COPY docker/Caddyfile /etc/caddy/Caddyfile
+COPY --chown=$USER:$WWWGROUP docker/start-review-container /usr/local/bin/start-review-container
 
 
 RUN chown -R "$USER":${WWWGROUP} /data/caddy && \
@@ -68,7 +69,6 @@ USER ${USER}
 WORKDIR /app
 
 COPY --chown=$USER:$WWWGROUP . /app
-COPY --chown=$USER:$WWWGROUP docker/start-review-container /usr/local/bin/start-review-container
 
 RUN mkdir -p /app/storage/logs && \
     npm install && \

From ec3fb3c3a66ea86308b5dcace4b8fc21b5558d07 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 08:18:25 +0200
Subject: [PATCH 13/21] fix: fix file permissions

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9297adc..3ae3b39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,7 +56,7 @@ COPY --chown=$USER:$WWWGROUP docker/start-review-container /usr/local/bin/start-
 RUN chown -R "$USER":${WWWGROUP} /data/caddy && \
     chown -R "$USER":${WWWGROUP} /config/caddy && \
     chmod 770 /usr/local/bin/start-review-container && \
-    chmod 222 /etc/caddy/Caddyfile && \
+    chmod 444 /etc/caddy/Caddyfile && \
     mkdir -p /var/www/.npm && chown -R $USER:$WWWGROUP /var/www/.npm && \
     chown -R $USER:$WWWGROUP /app
 

From 42646100db7678064125c25f5f4fba53fa5e5134 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <33828038+rburgstaller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 08:30:00 +0200
Subject: [PATCH 14/21] fix: proper caddy config

---
 docker/Caddyfile              | 1 +
 docker/start-review-container | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Caddyfile b/docker/Caddyfile
index 5764309..fced99a 100644
--- a/docker/Caddyfile
+++ b/docker/Caddyfile
@@ -1,6 +1,7 @@
 {
 	{$CADDY_GLOBAL_OPTIONS}
 	{$CADDY_GLOBAL_OPTIONS2}
+    
 	debug
 
 	frankenphp {
diff --git a/docker/start-review-container b/docker/start-review-container
index 70f7429..1acd46b 100644
--- a/docker/start-review-container
+++ b/docker/start-review-container
@@ -7,7 +7,6 @@ php artisan cache:clear
 echo "got port $PORT"
 
 export CADDY_GLOBAL_OPTIONS="http_port $PORT"
-export CADDY_SERVER_EXTRA_DIRECTIVES="debug"
 export SERVER_NAME="http://0.0.0.0:$PORT"
 
 # check what user and gid we have

From 29bf2620d0660819f172d3d2a56a93bad9dce6da Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <rainer.burgstaller@e-mundo.de>
Date: Mon, 22 Apr 2024 11:36:48 +0200
Subject: [PATCH 15/21] build: change compose port to simulate heroku better

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 25103d1..8029489 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,9 +8,9 @@ services:
       dockerfile: ./Dockerfile
     ports:
       # laravel
-      - '8002:443'
+      - '9999:9999'
     environment:
-      PORT: 81
+      PORT: 9999
     #user: '33:33'
     networks:
       - fp-network

From b53c9d117cf3072eff8d59c6be18117c40a2228b Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <rainer.burgstaller@e-mundo.de>
Date: Mon, 22 Apr 2024 15:28:30 +0200
Subject: [PATCH 16/21] build: try and enable laravel logging

---
 Dockerfile         | 1 +
 docker-compose.yml | 3 ++-
 docker/Caddyfile   | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3ae3b39..188f740 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,6 +58,7 @@ RUN chown -R "$USER":${WWWGROUP} /data/caddy && \
     chmod 770 /usr/local/bin/start-review-container && \
     chmod 444 /etc/caddy/Caddyfile && \
     mkdir -p /var/www/.npm && chown -R $USER:$WWWGROUP /var/www/.npm && \
+    mkdir -p /app/logs/laravel && \
     chown -R $USER:$WWWGROUP /app
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 8029489..ee4421d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,9 +9,10 @@ services:
     ports:
       # laravel
       - '9999:9999'
+      - '2019:2019'
     environment:
       PORT: 9999
-    #user: '33:33'
+    # user: '33:33'
     networks:
       - fp-network
 networks:
diff --git a/docker/Caddyfile b/docker/Caddyfile
index fced99a..e21f5a0 100644
--- a/docker/Caddyfile
+++ b/docker/Caddyfile
@@ -1,7 +1,7 @@
 {
-	{$CADDY_GLOBAL_OPTIONS}
+	{$CADDY_GLOBAL_OPTIONS} 
 	{$CADDY_GLOBAL_OPTIONS2}
-    
+
 	debug
 
 	frankenphp {
@@ -16,7 +16,7 @@
 	order php before file_server
 }
 
-{$CADDY_EXTRA_CONFIG} 
+{$CADDY_EXTRA_CONFIG}
 
 http://localhost:{$PORT:80} {
 	bind 0.0.0.0

From 9b2d9b72c4fcd1723c21847fbd794c338fce5b15 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <rainer.burgstaller@e-mundo.de>
Date: Mon, 22 Apr 2024 16:39:54 +0200
Subject: [PATCH 17/21] build: try and change uid

---
 Dockerfile                    |  2 +-
 docker/start-review-container | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 188f740..4ed981f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 #
 RUN apt-get update && apt-get install -y \
-      gnupg git libnss3-tools \
+      gnupg git libnss3-tools gosu \
       vim net-tools procps  # for testing for now
 
 
diff --git a/docker/start-review-container b/docker/start-review-container
index 1acd46b..66304d1 100644
--- a/docker/start-review-container
+++ b/docker/start-review-container
@@ -15,10 +15,18 @@ echo "whoami follows $(whoami)"
 
 # exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
 
+if [[ -n "${UID}" && "${UID}" -ne 33 ]]; then
+    echo "UID is set and is different from 33"
+    usermod -u $UID www-data
+else
+    echo "UID is not set or is equal to 33"
+fi
+
+
 if [ $# -gt 0 ]; then
   echo "starting custom command $@"
   exec gosu $WWWUSER "$@"
 else
   echo "starting entrypoint"
-  exec /usr/local/bin/docker-php-entrypoint --config /etc/caddy/Caddyfile --adapter caddyfile
+  exec gosu www-data /usr/local/bin/docker-php-entrypoint --config /etc/caddy/Caddyfile --adapter caddyfile
 fi

From 3b0230e629a53c71d21030731e3a1aabbbec2e89 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <rainer.burgstaller@e-mundo.de>
Date: Mon, 22 Apr 2024 16:56:01 +0200
Subject: [PATCH 18/21] fix: changing uid does not work

---
 docker/start-review-container | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/start-review-container b/docker/start-review-container
index 66304d1..c4bec3d 100644
--- a/docker/start-review-container
+++ b/docker/start-review-container
@@ -17,7 +17,7 @@ echo "whoami follows $(whoami)"
 
 if [[ -n "${UID}" && "${UID}" -ne 33 ]]; then
     echo "UID is set and is different from 33"
-    usermod -u $UID www-data
+    # usermod -u $UID www-data
 else
     echo "UID is not set or is equal to 33"
 fi

From f4325755bb39806c29e96d1287b9737b649225d0 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <rainer.burgstaller@e-mundo.de>
Date: Mon, 22 Apr 2024 16:57:22 +0200
Subject: [PATCH 19/21] fix: gosu does not work

---
 docker/start-review-container | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/start-review-container b/docker/start-review-container
index c4bec3d..8fb4745 100644
--- a/docker/start-review-container
+++ b/docker/start-review-container
@@ -28,5 +28,6 @@ if [ $# -gt 0 ]; then
   exec gosu $WWWUSER "$@"
 else
   echo "starting entrypoint"
-  exec gosu www-data /usr/local/bin/docker-php-entrypoint --config /etc/caddy/Caddyfile --adapter caddyfile
+#   exec gosu www-data /usr/local/bin/docker-php-entrypoint --config /etc/caddy/Caddyfile --adapter caddyfile
+  exec /usr/local/bin/docker-php-entrypoint --config /etc/caddy/Caddyfile --adapter caddyfile
 fi

From f7ae1099e3c1eaf0cd4e3fcdd5aa280b8793a532 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <rainer.burgstaller@e-mundo.de>
Date: Tue, 23 Apr 2024 05:56:15 +0200
Subject: [PATCH 20/21] fix: try and force bind to 0.0.0.0

---
 docker/Caddyfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Caddyfile b/docker/Caddyfile
index e21f5a0..527622a 100644
--- a/docker/Caddyfile
+++ b/docker/Caddyfile
@@ -1,5 +1,5 @@
 {
-	{$CADDY_GLOBAL_OPTIONS} 
+	{$CADDY_GLOBAL_OPTIONS}
 	{$CADDY_GLOBAL_OPTIONS2}
 
 	debug
@@ -18,7 +18,7 @@
 
 {$CADDY_EXTRA_CONFIG}
 
-http://localhost:{$PORT:80} {
+http://:{$PORT:80} {
 	bind 0.0.0.0
 
 	#log {

From f24711a9370bd9c094f9bf1cb419dc3f9953f074 Mon Sep 17 00:00:00 2001
From: Rainer Burgstaller <rainer.burgstaller@e-mundo.de>
Date: Tue, 23 Apr 2024 06:35:24 +0200
Subject: [PATCH 21/21] fix: use correct server binding spec

---
 docker/Caddyfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Caddyfile b/docker/Caddyfile
index 527622a..91c4fad 100644
--- a/docker/Caddyfile
+++ b/docker/Caddyfile
@@ -18,7 +18,7 @@
 
 {$CADDY_EXTRA_CONFIG}
 
-http://:{$PORT:80} {
+:{$PORT:8080} {
 	bind 0.0.0.0
 
 	#log {