From d80902087e838a4ca6cfee49d6a68b5261305982 Mon Sep 17 00:00:00 2001
From: Patrick Weyck
Date: Wed, 24 Jan 2024 13:06:20 +0100
Subject: [PATCH 1/3] Use plugin:update:all to install all plugins
---
rootfs/setup_6.6.x | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/rootfs/setup_6.6.x b/rootfs/setup_6.6.x
index dc47891..ac988d7 100755
--- 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
+ plugin:update:all
}
install_all_plugins() {
From 37ebe17106276c4dab6d20e15f122af34a7bf3dd Mon Sep 17 00:00:00 2001
From: Patrick Weyck
Date: Wed, 24 Jan 2024 13:06:37 +0100
Subject: [PATCH 2/3] Fix build action
---
.github/workflows/build.yml | 3 +++
generate.php | 1 +
2 files changed, 4 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ddd46ac..e453c05 100644
--- 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
index a5c21d9..bf878dd 100644
--- 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
From 7a7b963d31160e93dd93384cb0b2863f8bad85b3 Mon Sep 17 00:00:00 2001
From: Patrick Weyck
Date: Wed, 24 Jan 2024 13:10:22 +0100
Subject: [PATCH 3/3] Fix update plugins and use system:is-installed
---
rootfs/setup_6.6.x | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rootfs/setup_6.6.x b/rootfs/setup_6.6.x
index ac988d7..2399613 100755
--- a/rootfs/setup_6.6.x
+++ b/rootfs/setup_6.6.x
@@ -30,7 +30,7 @@ console() {
}
update_all_plugins() {
- plugin:update:all
+ console plugin:update:all
}
install_all_plugins() {
@@ -41,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