Merge pull request #1437 from shopware/cursor/paas-compose-redis-rustfs-705c

feat: generate Redis and RustFS for PaaS project-dev compose

Author: shyim

.github/workflows/smoke-test.yml

@@ -5,6 +5,9 @@ on:
       - main
   pull_request:
 
+permissions:
+  contents: read
+
 jobs:
   run:
     runs-on: ubuntu-latest

README.md

@@ -102,7 +102,7 @@ environments:
 
 Omit `-e` / `--env` to target `environments.local`. Use `-e staging` (or another name) to target a different environment.
 
-`shopware-cli project create` and `shopware-cli project config init` write `environments.local`. Top-level `url` and `admin_api` are deprecated: existing files that still use them keep working until that support is removed, and mixed files (top-level shop plus `environments.local`) are not silently retargeted.
+`shopware-cli project create` and `shopware-cli project config init` write `environments.local`. Top-level `url` and `admin_api` are deprecated: they are used only when `environments.local` is absent. When both are present, `environments.local` wins.
 
 ### Disable update notifications
 

cmd/project/project.go

@@ -11,7 +11,7 @@ var (
 	environmentName   string
 )
 
-const environmentFlagUsage = "Environment to target (defaults to environments.local; deprecated top-level url/admin_api is still used when present)"
+const environmentFlagUsage = "Environment to target (defaults to environments.local; deprecated top-level url/admin_api is used when environments.local is absent)"
 
 var projectRootCmd = &cobra.Command{
 	Use:   "project",

cmd/project/project_env_resolution_test.go

@@ -89,6 +89,9 @@ admin_api:
 environments:
   local:
     url: http://127.0.0.1:7
+    admin_api:
+      client_id: local-id
+      client_secret: local-secret
 `), 0o644))
 
 	previousConfigPath := projectConfigPath

cmd/project/project_proxy.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/shyim/go-composer"
 	"github.com/spf13/cobra"
 
 	dockerpkg "github.com/shopware/shopware-cli/internal/docker"
@@ -236,15 +235,10 @@ func (e *proxyEnvironment) up(cmd *cobra.Command) error {
 }
 
 // proxyBrowserHostnames returns the shop's proxy hostnames (root + routed
-// subdomains) for the WSL Windows hosts line, reading the optional AMQP and
-// Elasticsearch services from the project's composer.lock.
+// subdomains) for the WSL Windows hosts line, using the same lock-package
+// detection as compose generation.
 func proxyBrowserHostnames(projectRoot, hostname string) []string {
-	hasAMQP, hasElasticsearch := false, false
-	if lock, err := composer.ReadLock(filepath.Join(projectRoot, "composer.lock")); err == nil {
-		hasAMQP = lock.GetPackage("symfony/amqp-messenger") != nil
-		hasElasticsearch = lock.GetPackage("shopware/elasticsearch") != nil
-	}
-	return proxy.ProxyHostnames(hostname, hasAMQP, hasElasticsearch)
+	return proxy.ProxyHostnames(hostname, dockerpkg.FeaturesFromLockFile(filepath.Join(projectRoot, "composer.lock")))
 }
 
 // maybePrintWSLWindowsAccess prints the one-time Windows-side steps (import the

docs/proxy.md

@@ -160,7 +160,10 @@ regenerate it with proxy routing, `down` regenerates it with fixed ports.
 Because the whole file is generated, proxy mode simply omits the host ports
 instead of clearing them with a `!reset` tag — so there is **no Docker Compose
 version requirement**. The database keeps its published loopback port in both
-modes, so host tools (and the sales-channel URL update) still reach it.
+modes, so host tools (and the sales-channel URL update) still reach it. PaaS
+projects (`shopware/k8s-meta` in `composer.lock`) route RustFS at `s3.<host>`
+(S3 API, used as `K8S_FILESYSTEM_PUBLIC_URL`) and `rustfs.<host>` (console).
+PHP still talks to `rustfs:9000` on the compose network. Redis stays internal.
 
 Why a direct database `UPDATE` for the sales channel domain instead of a
 console command: it works on **every Shopware version** (the core
@@ -345,7 +348,7 @@ two things the CLI cannot do from inside the subsystem (it prints them via
   127.0.0.1 shop1.shopware.local admin-watch.shop1.shopware.local storefront-watch.shop1.shopware.local adminer.shop1.shopware.local mailer.shop1.shopware.local
   ```
   `proxy up` prints this exact line for the current shop, including any
-  `lavinmq`/`opensearch` subdomains the project uses.
+  `lavinmq`/`opensearch`/`s3`/`rustfs` subdomains the project uses.
 
 The CA import is one-time per machine; the hosts line is per shop.
 
@@ -362,7 +365,9 @@ The CA import is one-time per machine; the hosts line is per shop.
 - Auxiliary services keep working through subdomains (`mailer.shop1…`,
   `adminer.shop1…`); their raw ports (management/UI) are not published in proxy
   mode — use `docker compose exec` for direct access. The database is the
-  exception: it keeps a random published loopback port in both modes.
+  exception: it keeps a random published loopback port in both modes. PaaS
+  stacks route RustFS at `s3.<host>` / `rustfs.<host>` so media URLs stay
+  HTTPS on the local domain. Redis is compose-internal only.
 - Only the shop's **root** hostname is aliased for in-container use — service
   subdomains (`mailer.…`) are host/browser-facing.
 - **Changing the admin-worker setting while a shop is proxied can orphan the