feat(paas): make theme writeable to simplify setups

JensBrunken · Jun 5, 2024 · 59f44aa · 59f44aa
1 parent 53a42d4
commit 59f44aa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/shopware/paas-meta/6.6/.platform/applications.yaml b/shopware/paas-meta/6.6/.platform/applications.yaml
@@ -29,6 +29,8 @@
             SHOPWARE_ES_INDEX_PREFIX: "sw6"
             # Disables the Shopware web installer
             SHOPWARE_SKIP_WEBINSTALLER: 1
+            # Dont compile the theme during build
+            SHOPWARE_SKIP_THEME_COMPILE: 1
             # Enables the Shopware Composer plugin loader and disables the database plugin loader. All extensions will need to be installed with Composer
             COMPOSER_PLUGIN_LOADER: 1
             COMPOSER_ROOT_VERSION: 1.0.0
@@ -132,9 +134,8 @@
                 # this will try to run theme:compile which cannot be disabled, so it will throw a bunch of warnings
                 # that can be ignored (we use stateless build anyway, so this is done already at this point)
                 echo "Running system:install (Warnings for theme:compile can be ignored)"
-                bin/console system:install --create-database --basic-setup --force --no-assign-theme --skip-assets-install
-                bin/console theme:change --all Storefront --no-compile
-                bin/console theme:dump
+                bin/console system:install --create-database --basic-setup --force --skip-assets-install
+
 
                 # Disable FRW
                 bin/console system:config:set core.frw.completedAt '2019-10-07T10:46:23+00:00'
@@ -197,6 +198,11 @@
 
             # Send USR2 signal to php-fpm to clear the opcache
             pkill -f -USR2 -u web php-fpm
+        post_deploy: |
+            set -e
+
+            php bin/console theme:compile --sync
+
     # The relationships of the application with services or other applications.
     # The left-hand side is the name of the relationship as it will be exposed
     # to the application in the PLATFORM_RELATIONSHIPS variable. The right-hand
@@ -224,10 +230,10 @@
             source: service
             service: fileshare
             source_path: "public/thumbnail"
-        "/config/secrets":
+        "/public/theme":
             source: service
             service: fileshare
-            source_path: "config/secrets"
+            source_path: "public/theme"
         "/var":
             source: service
             service: fileshare

diff --git a/shopware/paas-meta/6.6/config/packages/paas.yaml b/shopware/paas-meta/6.6/config/packages/paas.yaml
@@ -36,12 +36,6 @@ when@prod:
                 process_psr_3_messages: false
                 channels: ["!event", "!doctrine"]
 
-storefront:
-    theme:
-        config_loader_id: Shopware\Storefront\Theme\ConfigLoader\StaticFileConfigLoader
-        available_theme_provider: Shopware\Storefront\Theme\ConfigLoader\StaticFileAvailableThemeProvider
-        theme_path_builder_id: Shopware\Storefront\Theme\MD5ThemePathBuilder
-
 elasticsearch:
     index_settings:
         number_of_replicas: null