Merge pull request #57 from shopware/fix-build

Fix build
shopware · Jan 24, 2024 · c2590ee · c2590ee
2 parents f676176 + 7a7b963
commit c2590ee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,6 +41,7 @@ jobs:
         with:
           tags: ghcr.io/shopware/docker-base:8.1.26-arm64
           context: .
+          file: 8.1/Dockerfile
           cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.1-arm64
           cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.1-arm64,mode=max
           platforms: linux/arm64
@@ -94,6 +95,7 @@ jobs:
         with:
           tags: ghcr.io/shopware/docker-base:8.2.14-arm64
           context: .
+          file: 8.2/Dockerfile
           cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.2-arm64
           cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.2-arm64,mode=max
           platforms: linux/arm64
@@ -147,6 +149,7 @@ jobs:
         with:
           tags: ghcr.io/shopware/docker-base:8.3.1-arm64
           context: .
+          file: 8.3/Dockerfile
           cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.3-arm64
           cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.3-arm64,mode=max
           platforms: linux/arm64

diff --git a/generate.php b/generate.php
@@ -108,6 +108,7 @@
         with:
           tags: ghcr.io/shopware/docker-base:${PHP_PATCH_VERSION}-arm64
           context: .
+          file: ${PHP_VERSION}/Dockerfile
           cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:${PHP_VERSION}-arm64
           cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:${PHP_VERSION}-arm64,mode=max
           platforms: linux/arm64

diff --git a/rootfs/setup_6.6.x b/rootfs/setup_6.6.x
@@ -30,11 +30,7 @@ console() {
 }
 
 update_all_plugins() {
-  list_with_updates=$(php bin/console plugin:list --json | jq 'map(select(.upgradeVersion != null)) | .[].name' -r)
-
-  for plugin in $list_with_updates; do
-    console plugin:update $plugin
-  done
+  console plugin:update:all
 }
 
 install_all_plugins() {
@@ -45,7 +41,7 @@ install_all_plugins() {
   done
 }
 
-if php bin/console system:config:get shopware.installed; then
+if console system:is-installed; then
   if [[ ${SHOPWARE_SKIP_ASSET_COPY-""} ]]; then
       console system:update:finish --skip-assets
   else