Remove no more required file and clean configurations

Prometee · Prometee · commit 39ea03f2fc34 · 2025-04-01T23:38:30.000+02:00
diff --git a/.github/workflows/sylius-frankenphp.yml b/.github/workflows/sylius-frankenphp.yml
@@ -3,8 +3,16 @@ name: PHP Docker Image CI for Sylius
 on:
     workflow_dispatch: ~
     push:
-        branches:
-            - frankenphp
+        branches: [ frankenphp ]
+        paths:
+            - 'frankenphp/**'
+            - 'WORKSPACE'
+    schedule:
+        - cron: '0 20 * * 5'
+
+concurrency:
+    group: sylius_frankenphp_build
+    cancel-in-progress: false
 
 jobs:
 
@@ -66,15 +74,14 @@ jobs:
                   password: ${{ secrets.GITHUB_TOKEN }}
                   logout: true
 
-            - name: Build and push
-              uses: docker/build-push-action@v5.0.0
+            - name: Build multiplatform
+              uses: docker/build-push-action@v5
               with:
                   file: ./frankenphp/Dockerfile
                   context: ./frankenphp
-                  build-args: |
-                      "FRANKENPHP_VERSION=${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}"
+                  build-args: "FRANKENPHP_VERSION=${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}"
                   platforms: linux/amd64,linux/arm64
-                  push: ${{ github.ref == 'refs/heads/frankenphp' || github.event_name == 'workflow_dispatch' }}
+                  push: false
                   pull: true
                   tags: ${{ steps.meta.outputs.tags }}
                   cache-from: type=local,src=/tmp/.buildx-cache
@@ -108,107 +115,42 @@ jobs:
                   cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new-arm64
                   outputs: type=docker,dest=./external/image-arm64.tar
 
-#            - name: Mount Bazel cache
-#              uses: actions/cache@v4
-#              with:
-#                  path: "~/.cache/bazel"
-#                  key: "${{ runner.os }}-frankenphp-${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}-bazel-cache-${{ vars.CACHE_VERSION }}-${{ steps.generate-uuid.outputs.uuid }}"
-#                  restore-keys: "${{ runner.os }}-frankenphp-${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}-bazel-cache-${{ vars.CACHE_VERSION }}-"
-
-#            - name: Setup PHP for Bazel
-#              run: |
-#                  set -ex
-#                  cat > frankenphp/php-version.bzl <<EOF
-#                  PHP_VERSION = "${{ matrix.php }}"
-#                  EOF
-#                  cat > frankenphp/frankenphp-arch.bzl <<EOF
-#                  ARCHITECTURES = ["amd64", "arm64"]
-#                  EOF
-
-#            - name: Bazel build and test
-#              run: |
-#                  set -ex
-#                  targets=$(bazel query 'attr(visibility, "//visibility:public", //frankenphp:*)' | sort)
-#                  bazel build --curses=no ${targets}
-#                  bazel test --curses=no --test_output=errors ${targets}
-
-            - name: Move cache
-              run: |
-                  rm -rf /tmp/.buildx-cache
-                  mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
-    build-xdebug:
-        needs: build
-
-        name: "Sylius PHP with Xdebug - ${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}"
-
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: false
-            matrix:
-                frankenphp: [ "1.5-php" ]
-                php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
-                distro: [ "", "-alpine" ]
-
-        steps:
-
-            - uses: actions/checkout@v4
-
-            - name: Generate UUID
-              id: generate-uuid
-              run: |
-                  UUID=$(cat /proc/sys/kernel/random/uuid)
-                  echo "UUID=${UUID}" >> $GITHUB_OUTPUT
-
-            - name: Set up QEMU
-              id: qemu
-              uses: docker/setup-qemu-action@v3
-
-            - name: Available platforms
-              run: echo ${{ steps.qemu.outputs.platforms }}
-
-            - name: Docker meta
-              id: meta
-              uses: docker/metadata-action@v5
-              with:
-                  images: ${{ vars.DOCKER_FRANKENPHP_REPOSITORY_NAME }}
-                  tags: |
-                      type=raw,value=${{ matrix.frankenphp }}${{ matrix.php }}-xdebug-${{ matrix.distro }}
-
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v3
-
-            - name: Cache Docker layers
+            - name: Mount Bazel cache
               uses: actions/cache@v4
               with:
-                  path: /tmp/.buildx-cache
-                  key: "${{ runner.os }}-frankenphp-xdebug-${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}-buildx-cache-${{ vars.CACHE_VERSION }}-${{ steps.generate-uuid.outputs.uuid }}"
-                  # https://github.com/actions/cache/issues/109#issuecomment-558771281
-                  # https://github.community/t/always-save-new-cache-for-incremental-builds/172791
-                  restore-keys: "${{ runner.os }}-frankenphp-xdebug-${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}-buildx-cache-${{ vars.CACHE_VERSION }}-"
+                  path: "~/.cache/bazel"
+                  key: "${{ runner.os }}-frankenphp-${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}-bazel-cache-${{ vars.CACHE_VERSION }}-${{ steps.generate-uuid.outputs.uuid }}"
+                  restore-keys: "${{ runner.os }}-frankenphp-${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}-bazel-cache-${{ vars.CACHE_VERSION }}-"
 
-            - name: Docker Login
-              uses: docker/login-action@v3
-              with:
-                  registry: ghcr.io
-                  username: ${{ github.actor }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
-                  logout: true
+            - name: Setup PHP for Bazel
+              run: |
+                  set -ex
+                  cat > frankenphp/php-version.bzl <<EOF
+                  PHP_VERSION = "${{ matrix.php }}"
+                  EOF
+                  cat > frankenphp/frankenphp-arch.bzl <<EOF
+                  ARCHITECTURES = ["amd64", "arm64"]
+                  EOF
+
+            - name: Bazel build and test
+              run: |
+                  set -ex
+                  targets=$(bazel query 'attr(visibility, "//visibility:public", //frankenphp:*)' | sort)
+                  bazel build --curses=no ${targets}
+                  bazel test --curses=no --test_output=errors ${targets}
 
-            - name: Build and push
+            - name: Push
               uses: docker/build-push-action@v5
               with:
-                  file: ./frankenphp/xdebug.Dockerfile
+                  file: ./frankenphp/Dockerfile
                   context: ./frankenphp
-                  build-args: |
-                      "IMAGE_NAME=${{ vars.DOCKER_FRANKENPHP_REPOSITORY_NAME }}"
-                      "IMAGE_TAG=${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}"
+                  build-args: "FRANKENPHP_VERSION=${{ matrix.frankenphp }}${{ matrix.php }}-${{ matrix.distro }}"
                   platforms: linux/amd64,linux/arm64
                   push: ${{ github.ref == 'refs/heads/frankenphp' || github.ref == 'refs/heads/main' || github.event_name == 'release' }}
-                  pull: true
+                  pull: false
                   tags: ${{ steps.meta.outputs.tags }}
-                  cache-from: type=local,src=/tmp/.buildx-cache
+                  labels: ${{ steps.meta.outputs.labels }}
+                  cache-from: type=local,src=/tmp/.buildx-cache-new
                   cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
 
             - name: Move cache
diff --git a/frankenphp/Caddyfile b/frankenphp/Caddyfile
@@ -9,55 +9,9 @@
 {$CADDY_EXTRA_CONFIG}
 
 {$SERVER_NAME:localhost} {
-	log {
-		# Redact the authorization query parameter that can be set by Mercure
-		format filter {
-			request>uri query {
-				replace authorization REDACTED
-			}
-		}
-	}
 
 	root * /srv/sylius/public
 	encode zstd br gzip
 
-	mercure {
-		# Transport to use (default to Bolt)
-		transport_url {$MERCURE_TRANSPORT_URL:bolt:///frankenphp-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
-
-	# Add links to the API docs and to the Mercure Hub if not set explicitly (e.g. the PWA)
-	header ?Link `</docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation", </.well-known/mercure>; rel="mercure"`
-	# Disable Topics tracking if not enabled explicitly: https://github.com/jkarlin/topics
-	header ?Permissions-Policy "browsing-topics=()"
-
-	# Matches requests for HTML documents, for static files and for Next.js files,
-	# except for known API paths and paths with extensions handled by API Platform
-	@pwa expression `(
-			header({'Accept': '*text/html*'})
-			&& !path(
-				'/docs*', '/graphql*', '/bundles*', '/contexts*', '/_profiler*', '/_wdt*',
-				'*.json*', '*.html', '*.csv', '*.yml', '*.yaml', '*.xml'
-			)
-		)
-		|| path('/favicon.ico', '/manifest.json', '/robots.txt', '/sitemap*', '/_next*', '/__next*')
-		|| query({'_rsc': '*'})`
-
-	# Comment the following line if you don't want Next.js to catch requests for HTML documents.
-	# In this case, they will be handled by the PHP app.
-	# reverse_proxy @pwa http://{$PWA_UPSTREAM}
-
 	php_server
 }
diff --git a/frankenphp/Dockerfile b/frankenphp/Dockerfile
@@ -6,40 +6,15 @@ ARG FRANKENPHP_VERSION=1.5-php8.2-alpine
 # Versions
 FROM dunglas/frankenphp:${FRANKENPHP_VERSION} AS frankenphp_upstream
 
-
 # The different stages of this Dockerfile are meant to be built into separate images
 # https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage
 # https://docs.docker.com/compose/compose-file/#target
 
-
 # Base FrankenPHP image
 FROM frankenphp_upstream AS frankenphp_base
 
 WORKDIR /srv/sylius
 
-# persistent / runtime deps
-# hadolint ignore=DL3008
-RUN if grep -q "Ubuntu" /etc/os-release; then \
-    apt-get update \
-    && apt-get install --no-install-recommends -y \
-        acl \
-        file \
-        gettext \
-        git \
-        libnss3-tools \
-    && rm -rf /var/lib/apt/lists/*; \
-elif grep -q "Alpine Linux" /etc/os-release; then \
-    apk add --no-cache --virtual .build-deps $PHPIZE_DEPS linux-headers \
-    && apk add --no-cache \
-        acl \
-        file \
-        gettext \
-        git \
-        nss-tools \
-        curl \
-    && apk del .build-deps; \
-fi
-
 # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
 ENV COMPOSER_ALLOW_SUPERUSER=1
 
@@ -56,32 +31,26 @@ RUN install-php-extensions \
     zip
 
 COPY --link conf.d/app.ini $PHP_INI_DIR/conf.d/
-COPY --link --chmod=755 docker-entrypoint.sh /usr/local/bin/docker-entrypoint
+COPY --link conf.d/app-cli.ini $PHP_INI_DIR/conf.d/
 COPY --link Caddyfile /etc/caddy/Caddyfile
 
-ENTRYPOINT ["docker-entrypoint"]
-
 HEALTHCHECK --start-period=60s CMD curl -f http://localhost:2019/metrics || exit 1
 CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ]
 
-RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini.production.backup"
-RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini.development.backup"
-
 # Dev FrankenPHP image
 FROM frankenphp_base AS frankenphp_dev
 
 ENV APP_ENV=dev XDEBUG_MODE=off
 VOLUME /app/var/
 
-RUN cp "$PHP_INI_DIR/php.ini.development.backup" "$PHP_INI_DIR/php.ini"
+RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
 
 RUN set -eux; \
 	install-php-extensions \
 		xdebug \
 	;
 
 COPY --link conf.d/app.dev.ini $PHP_INI_DIR/conf.d/
-COPY --link conf.d/app-cli.ini $PHP_INI_DIR/conf.d/
 
 CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]
 
@@ -91,8 +60,7 @@ FROM frankenphp_base AS frankenphp_prod
 ENV APP_ENV=prod
 ENV FRANKENPHP_CONFIG="import worker.Caddyfile"
 
-RUN cp "$PHP_INI_DIR/php.ini.production.backup" "$PHP_INI_DIR/php.ini"
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
 COPY --link conf.d/app.prod.ini $PHP_INI_DIR/conf.d/
-COPY --link conf.d/app-cli.ini $PHP_INI_DIR/conf.d/
 COPY --link worker.Caddyfile /etc/caddy/worker.Caddyfile
diff --git a/frankenphp/conf.d/app.dev.ini b/frankenphp/conf.d/app.dev.ini
@@ -0,0 +1,5 @@
+; See https://docs.docker.com/desktop/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host
+; See https://github.com/docker/for-linux/issues/264
+; The `client_host` below may optionally be replaced with `discover_client_host=yes`
+; Add `start_with_request=yes` to start debug session on each request
+xdebug.client_host = xdebug://gateway
diff --git a/frankenphp/docker-entrypoint.sh b/frankenphp/docker-entrypoint.sh
diff --git a/frankenphp/xdebug.Dockerfile b/frankenphp/xdebug.Dockerfile
