infra: update Docker config (#29)

* rename docker-compose files

* update Dockerfile

* update frankenphp Caddyfile, docker-entrypoint.sh

* update ci.yml

* update .dockerignore

* update .editorconfig

close: #28

.dockerignore

@@ -10,7 +10,10 @@
 **/.git/
 **/.gitattributes
 **/.gitignore
-**/.gitmodules
+***/compose.*.yaml
+**/compose.*.yml
+**/compose.yaml
+**/compose.yml*/.gitmodules
 **/docker-compose.*.yaml
 **/docker-compose.*.yml
 **/docker-compose.yaml

.editorconfig

@@ -12,63 +12,46 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.{js,html,ts,tsx}]
-indent_style = space
 indent_size = 2
 
 [*.json]
-indent_style = space
 indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
 
-[*.php]
-indent_style = space
-indent_size = 4
-
 [*.sh]
 indent_style = tab
-indent_size = 4
 
 [*.xml{,.dist}]
 indent_style = space
 indent_size = 4
 
 [*.{yaml,yml}]
-indent_style = space
-indent_size = 4
 trim_trailing_whitespace = false
 
 [.github/workflows/*.yml]
-indent_style = space
 indent_size = 2
 
 [.gitmodules]
 indent_style = tab
-indent_size = 4
 
 [.php_cs{,.dist}]
 indent_style = space
 indent_size = 4
 
-[.travis.yml]
-indent_style = space
-indent_size = 2
-
 [composer.json]
-indent_style = space
 indent_size = 4
 
-[docker-compose{,.*}.{yaml,yml}]
+[{,docker-}compose{,.*}.{yaml,yml}]
 indent_style = space
 indent_size = 2
 
-[Dockerfile]
+[{,*.*}Dockerfile]
 indent_style = tab
-indent_size = 4
 
-[Makefile]
+[{,*.*}Caddyfile]
 indent_style = tab
-indent_size = 4
-tab_width = 4
 
+[Makefile]
+indent_style = tab

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Lint Dockerfile
         uses: hadolint/[email protected]
   tests:
@@ -28,18 +28,18 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Build Docker images
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           load: true
           files: |
-            docker-compose.yml
-            docker-compose.override.yml
+            compose.yaml
+            compose.override.yaml
           set: |
             *.cache-from=type=gha,scope=${{github.ref}}
             *.cache-from=type=gha,scope=refs/heads/main

Dockerfile

@@ -16,22 +16,22 @@ WORKDIR /app
 # persistent / runtime deps
 # hadolint ignore=DL3018
 RUN apk add --no-cache \
-		acl \
-		fcgi \
-		file \
-		gettext \
-		git \
-		postgresql-dev \
+	acl \
+	file \
+	gettext \
+	git \
+	postgresql-dev \
 	;
 
 RUN set -eux; \
-    install-php-extensions \
-		apcu \
-		intl \
-		opcache \
-		zip \
-		pdo_pgsql \
-    ;
+	install-php-extensions \
+	apcu \
+	intl \
+	opcache \
+	opcache \
+	zip \
+	pdo_pgsql \
+	;
 
 COPY --link docker/frankenphp/conf.d/app.ini $PHP_INI_DIR/conf.d/
 COPY --link --chmod=755 docker/frankenphp/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
@@ -45,7 +45,7 @@ ENV PATH="${PATH}:/root/.composer/vendor/bin"
 
 COPY --from=composer_upstream --link /composer /usr/bin/composer
 
-HEALTHCHECK CMD wget --no-verbose --tries=1 --spider http://localhost:2019/metrics || exit 1
+HEALTHCHECK --start-period=60s CMD curl -f http://localhost:2019/metrics || exit 1
 CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ]
 
 # Dev FrankenPHP image
@@ -58,8 +58,8 @@ RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
 
 RUN set -eux; \
 	install-php-extensions \
-    	xdebug \
-    ;
+	xdebug \
+	;
 
 COPY --link docker/frankenphp/conf.d/app.dev.ini $PHP_INI_DIR/conf.d/
 

docker-compose.override.yml → compose.override.yaml

@@ -20,6 +20,7 @@ services:
     extra_hosts:
       # Ensure that host.docker.internal is correctly defined on Linux
       - host.docker.internal:host-gateway
+    tty: true
 
   database:
     image: postgres:${POSTGRES_VERSION:-15}-alpine

docker/frankenphp/Caddyfile

@@ -4,26 +4,31 @@
 	frankenphp {
 		{$FRANKENPHP_CONFIG}
 	}
-}
 
-{$SERVER_NAME:localhost}
+	# https://caddyserver.com/docs/caddyfile/directives#sorting-algorithm
+	order mercure after encode
+	order vulcain after reverse_proxy
+	order php_server before file_server
+}
 
 {$CADDY_EXTRA_CONFIG}
 
-log {
-	# Redact the authorization query parameter that can be set by Mercure
-	format filter {
-		wrap console
-		fields {
-			uri query {
-				replace authorization REDACTED
+{$SERVER_NAME:localhost} {
+	log {
+		# Redact the authorization query parameter that can be set by Mercure
+		format filter {
+			wrap console
+			fields {
+				uri query {
+					replace authorization REDACTED
+				}
 			}
 		}
 	}
-}
 
-route {
 	root * /app/public
+	encode zstd gzip
+
 	mercure {
 		# Transport to use (default to Bolt)
 		transport_url {$MERCURE_TRANSPORT_URL:bolt:///data/mercure.db}
@@ -38,28 +43,11 @@ route {
 		# Extra directives
 		{$MERCURE_EXTRA_DIRECTIVES}
 	}
-	vulcain
-
-	# Add trailing slash for directory requests
-	@canonicalPath {
-		file {path}/index.php
-		not path */
-	}
-	redir @canonicalPath {path}/ 308
-
-	# If the requested file does not exist, try index files
-	@indexFiles file {
-		try_files {path} {path}/index.php index.php
-		split_path .php
-	}
-	rewrite @indexFiles {http.matchers.file.relative}
 
-	# FrankenPHP!
-	@phpFiles path *.php
-	php @phpFiles
+	vulcain
 
-	encode zstd gzip
-	file_server
+	# Disable Topics tracking if not enabled explicitly: https://github.com/jkarlin/topics
+	header ?Permissions-Policy "browsing-topics=()"
 
-	respond 404
+	php_server
 }

docker/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