feat: add shopware bash script tests

rewardenv · Nov 25, 2024 · e0d48d8 · e0d48d8
1 parent 44dbe57
commit e0d48d8
Show file tree

Hide file tree

Showing 62 changed files with 123 additions and 47 deletions.
diff --git a/.github/workflows/main-docker-image-php-fpm-magento2-web.yml b/.github/workflows/main-docker-image-php-fpm-magento2-web.yml
@@ -27,12 +27,12 @@ jobs:
           curl -s https://bashunit.typeddevs.com/install.sh | bash -s -- /usr/local/bin
 
       - name: "Test"
-        run: 'find images/php-fpm/magento2-web/ -name "*_test.sh" -type f -print0 | xargs -0 -t bashunit'
+        run: 'find images/_php-fpm-common/magento2-web/ -name "*_test.sh" -type f -print0 | xargs -0 -t bashunit'
 
   build:
     name: "Build php-fpm/magento2-web"
-    needs: [ test ]
     runs-on: ubuntu-latest
+    needs: [ test ]
     if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
     strategy:
       matrix:
@@ -115,6 +115,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE == 'true' }}
         with:
           context: images/php-fpm/magento2-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/magento2-web
           file: images/php-fpm/magento2-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"
@@ -130,6 +132,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE != 'true' }}
         with:
           context: images/php-fpm/magento2-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/magento2-web
           file: images/php-fpm/magento2-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"

diff --git a/.github/workflows/main-docker-image-php-fpm-rootless-magento2-web.yml b/.github/workflows/main-docker-image-php-fpm-rootless-magento2-web.yml
@@ -27,12 +27,12 @@ jobs:
           curl -s https://bashunit.typeddevs.com/install.sh | bash -s -- /usr/local/bin
 
       - name: "Test"
-        run: 'find images/php-fpm-rootless/magento2-web/ -name "*_test.sh" -type f -print0 | xargs -0 -t bashunit'
+        run: 'find images/_php-fpm-common/magento2-web/ -name "*_test.sh" -type f -print0 | xargs -0 -t bashunit'
 
   build:
     name: "Build php-fpm-rootless/magento2-web"
-    needs: [ test ]
     runs-on: ubuntu-latest
+    needs: [ test ]
     if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
     strategy:
       matrix:
@@ -115,6 +115,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE == 'true' }}
         with:
           context: images/php-fpm-rootless/magento2-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/magento2-web
           file: images/php-fpm-rootless/magento2-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"
@@ -130,6 +132,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE != 'true' }}
         with:
           context: images/php-fpm-rootless/magento2-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/magento2-web
           file: images/php-fpm-rootless/magento2-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"

diff --git a/.github/workflows/main-docker-image-php-fpm-rootless-shopware-web.yml b/.github/workflows/main-docker-image-php-fpm-rootless-shopware-web.yml
@@ -27,12 +27,12 @@ jobs:
           curl -s https://bashunit.typeddevs.com/install.sh | bash -s -- /usr/local/bin
 
       - name: "Test"
-        run: 'find images/php-fpm-rootless/shopware-web/ -name "*_test.sh" -type f -print0 | xargs -0 -t bashunit'
+        run: 'find images/_php-fpm-common/shopware-web/ -name "*_test.sh" -type f -print0 | xargs -0 -t bashunit'
 
   build:
     name: "Build php-fpm-rootless/shopware-web"
-    needs: [ test ]
     runs-on: ubuntu-latest
+    needs: [ test ]
     if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
     strategy:
       matrix:
@@ -115,6 +115,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE == 'true' }}
         with:
           context: images/php-fpm-rootless/shopware-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/shopware-web
           file: images/php-fpm-rootless/shopware-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"
@@ -130,6 +132,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE != 'true' }}
         with:
           context: images/php-fpm-rootless/shopware-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/shopware-web
           file: images/php-fpm-rootless/shopware-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"

diff --git a/.github/workflows/main-docker-image-php-fpm-rootless-wordpress-web.yml b/.github/workflows/main-docker-image-php-fpm-rootless-wordpress-web.yml
@@ -27,7 +27,7 @@ jobs:
           curl -s https://bashunit.typeddevs.com/install.sh | bash -s -- /usr/local/bin
 
       - name: "Test"
-        run: 'find images/php-fpm-rootless/wordpress-web/ -name "*_test.sh" -type f -print0 | xargs -0 -t bashunit'
+        run: 'find images/_php-fpm-common/wordpress-web/ -name "*_test.sh" -type f -print0 | xargs -0 -t bashunit'
 
   build:
     name: "Build php-fpm-rootless/wordpress-web"
@@ -115,6 +115,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE == 'true' }}
         with:
           context: images/php-fpm-rootless/wordpress-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/wordpress-web
           file: images/php-fpm-rootless/wordpress-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"
@@ -130,6 +132,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE != 'true' }}
         with:
           context: images/php-fpm-rootless/wordpress-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/wordpress-web
           file: images/php-fpm-rootless/wordpress-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"

diff --git a/.github/workflows/main-docker-image-php-fpm-shopware-web.yml b/.github/workflows/main-docker-image-php-fpm-shopware-web.yml
@@ -31,8 +31,8 @@ jobs:
 
   build:
     name: "Build php-fpm/shopware-web"
-    needs: [ test ]
     runs-on: ubuntu-latest
+    needs: [ test ]
     if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
     strategy:
       matrix:
@@ -115,6 +115,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE == 'true' }}
         with:
           context: images/php-fpm/shopware-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/shopware-web
           file: images/php-fpm/shopware-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"
@@ -130,6 +132,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE != 'true' }}
         with:
           context: images/php-fpm/shopware-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/shopware-web
           file: images/php-fpm/shopware-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"

diff --git a/.github/workflows/main-docker-image-php-fpm-wordpress-web.yml b/.github/workflows/main-docker-image-php-fpm-wordpress-web.yml
@@ -27,12 +27,12 @@ jobs:
           curl -s https://bashunit.typeddevs.com/install.sh | bash -s -- /usr/local/bin
 
       - name: "Test"
-        run: 'find images/php-fpm/wordpress-web/ -name "*_test.sh" -type f -print0 | xargs -0 -t bashunit'
+        run: 'find images/_php-fpm-common/wordpress-web/ -name "*_test.sh" -type f -print0 | xargs -0 -t bashunit'
 
   build:
     name: "Build php-fpm/wordpress-web"
-    needs: [ test ]
     runs-on: ubuntu-latest
+    needs: [ test ]
     if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
     strategy:
       matrix:
@@ -115,6 +115,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE == 'true' }}
         with:
           context: images/php-fpm/wordpress-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/wordpress-web
           file: images/php-fpm/wordpress-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"
@@ -130,6 +132,8 @@ jobs:
         if: ${{ matrix.DEFAULT_IMAGE != 'true' }}
         with:
           context: images/php-fpm/wordpress-web/context
+          build-contexts: |
+            scripts=images/_php-fpm-common/wordpress-web
           file: images/php-fpm/wordpress-web/Dockerfile
           push: true
           platforms: "linux/amd64,linux/arm64"

diff --git a/images/README.md b/images/README.md
@@ -39,8 +39,18 @@ gomplate -f images/php-fpm-rootless/base/tpl.Dockerfile -o - \
       -f - \
       -t rewardenv/php-fpm:${PHP_VERSION} \
       --build-arg PHP_VERSION \
+      --build-context scripts=images/_php-fpm-scripts/context/
       --progress plain \
       images/php-fpm-rootless/base/context
+
+gomplate -f images/php-fpm-rootless/shopware-web/tpl.Dockerfile -o - \
+  | docker build \
+      -f - \
+      -t rewardenv/php-fpm:${PHP_VERSION}-shopware-web \
+      --build-arg PHP_VERSION \
+      --build-context scripts=images/_php-fpm-common/shopware-web \
+      --progress plain \
+      images/php-fpm-rootless/shopware-web/context
 ```
 
 ## SSHD

diff --git a/...web/context/rootfs/usr/local/bin/build.sh → ..._php-fpm-common/magento2-web/bin/build.sh b/...web/context/rootfs/usr/local/bin/build.sh → ..._php-fpm-common/magento2-web/bin/build.sh
diff --git a/...ontext/rootfs/usr/local/bin/build_test.sh → ...fpm-common/magento2-web/bin/build_test.sh b/...ontext/rootfs/usr/local/bin/build_test.sh → ...fpm-common/magento2-web/bin/build_test.sh
diff --git a/...ootfs/usr/local/bin/check-dependencies.sh → ...on/magento2-web/bin/check-dependencies.sh b/...ootfs/usr/local/bin/check-dependencies.sh → ...on/magento2-web/bin/check-dependencies.sh
diff --git a/.../usr/local/bin/check-dependencies_test.sh → ...gento2-web/bin/check-dependencies_test.sh b/.../usr/local/bin/check-dependencies_test.sh → ...gento2-web/bin/check-dependencies_test.sh
diff --git a/...context/rootfs/usr/local/bin/functions.sh → ...-fpm-common/magento2-web/bin/functions.sh b/...context/rootfs/usr/local/bin/functions.sh → ...-fpm-common/magento2-web/bin/functions.sh
diff --git a/...xt/rootfs/usr/local/bin/functions_test.sh → ...common/magento2-web/bin/functions_test.sh b/...xt/rootfs/usr/local/bin/functions_test.sh → ...common/magento2-web/bin/functions_test.sh
@@ -75,12 +75,25 @@ function test_app_path() {
 }
 
 function test_version_gt() {
-  assert_true "$(version_gt '2.4.4' '2.3.99')"
-  assert_false "$(version_gt '2.3.99' '2.4.4')"
-  assert_false "$(version_gt '2.4.4' '2.4.4')"
-  assert_true "$(version_gt '2.4' '2.3.99')"
-  assert_false "$(version_gt '2.3.99' '2.4')"
-  assert_false "$(version_gt '2.4' '2.4')"
+  assert_exit_code 0 "$(version_gt '2.4.4' '2.3.99')"
+  assert_exit_code 1 "$(version_gt '2.3.99' '2.4.4')"
+  assert_exit_code 1 "$(version_gt '2.4.4' '2.4.4')"
+  assert_exit_code 0 "$(version_gt '2.4' '2.3.99')"
+  assert_exit_code 1 "$(version_gt '2.3.99' '2.4')"
+  assert_exit_code 1 "$(version_gt '2.4' '2.4')"
+  assert_exit_code 0 "$(version_gt 'v2.4.4' '2.3.99')"
+  assert_exit_code 1 "$(version_gt '2.3.99' 'v2.4.4')"
+  assert_exit_code 1 "$(version_gt 'v2.4.4' 'v2.4.4')"
+  assert_exit_code 0 "$(version_gt '2.4' 'v2.3.99')"
+  assert_exit_code 1 "$(version_gt 'v2.3.99' '2.4')"
+  assert_exit_code 1 "$(version_gt 'v2.4' '2.4')"
+
+  if version_gt '2.3.99' '2.4.0'; then
+    fail
+  fi
+  if ! version_gt '2.4.0' 'v2.3.99.99'; then
+    fail
+  fi
 }
 
 function test_run_hooks() {

diff --git a/...b/context/rootfs/usr/local/bin/install.sh → ...hp-fpm-common/magento2-web/bin/install.sh b/...b/context/rootfs/usr/local/bin/install.sh → ...hp-fpm-common/magento2-web/bin/install.sh
diff --git a/...text/rootfs/usr/local/bin/install_test.sh → ...m-common/magento2-web/bin/install_test.sh b/...text/rootfs/usr/local/bin/install_test.sh → ...m-common/magento2-web/bin/install_test.sh
diff --git a/...ontext/rootfs/usr/local/bin/post-start.sh → ...fpm-common/magento2-web/bin/post-start.sh b/...ontext/rootfs/usr/local/bin/post-start.sh → ...fpm-common/magento2-web/bin/post-start.sh
diff --git a/...t/rootfs/usr/local/bin/post-start_test.sh → ...ommon/magento2-web/bin/post-start_test.sh b/...t/rootfs/usr/local/bin/post-start_test.sh → ...ommon/magento2-web/bin/post-start_test.sh
diff --git a/.../context/rootfs/usr/local/bin/pre-stop.sh → ...p-fpm-common/magento2-web/bin/pre-stop.sh b/.../context/rootfs/usr/local/bin/pre-stop.sh → ...p-fpm-common/magento2-web/bin/pre-stop.sh
diff --git a/...ext/rootfs/usr/local/bin/pre-stop_test.sh → ...-common/magento2-web/bin/pre-stop_test.sh b/...ext/rootfs/usr/local/bin/pre-stop_test.sh → ...-common/magento2-web/bin/pre-stop_test.sh
diff --git a/...t/rootfs/usr/local/bin/stop-supervisor.sh → ...ommon/magento2-web/bin/stop-supervisor.sh b/...t/rootfs/usr/local/bin/stop-supervisor.sh → ...ommon/magento2-web/bin/stop-supervisor.sh
diff --git a/...web/context/rootfs/usr/local/bin/build.sh → ..._php-fpm-common/shopware-web/bin/build.sh b/...web/context/rootfs/usr/local/bin/build.sh → ..._php-fpm-common/shopware-web/bin/build.sh
diff --git a/...ontext/rootfs/usr/local/bin/build_test.sh → ...fpm-common/shopware-web/bin/build_test.sh b/...ontext/rootfs/usr/local/bin/build_test.sh → ...fpm-common/shopware-web/bin/build_test.sh
diff --git a/...ootfs/usr/local/bin/check-dependencies.sh → ...on/shopware-web/bin/check-dependencies.sh b/...ootfs/usr/local/bin/check-dependencies.sh → ...on/shopware-web/bin/check-dependencies.sh
diff --git a/.../usr/local/bin/check-dependencies_test.sh → ...opware-web/bin/check-dependencies_test.sh b/.../usr/local/bin/check-dependencies_test.sh → ...opware-web/bin/check-dependencies_test.sh
diff --git a/...context/rootfs/usr/local/bin/functions.sh → ...-fpm-common/shopware-web/bin/functions.sh b/...context/rootfs/usr/local/bin/functions.sh → ...-fpm-common/shopware-web/bin/functions.sh
diff --git a/...xt/rootfs/usr/local/bin/functions_test.sh → ...common/shopware-web/bin/functions_test.sh b/...xt/rootfs/usr/local/bin/functions_test.sh → ...common/shopware-web/bin/functions_test.sh
@@ -75,12 +75,25 @@ function test_app_path() {
 }
 
 function test_version_gt() {
-  assert_true "$(version_gt '2.4.4' '2.3.99')"
-  assert_false "$(version_gt '2.3.99' '2.4.4')"
-  assert_false "$(version_gt '2.4.4' '2.4.4')"
-  assert_true "$(version_gt '2.4' '2.3.99')"
-  assert_false "$(version_gt '2.3.99' '2.4')"
-  assert_false "$(version_gt '2.4' '2.4')"
+  assert_exit_code 0 "$(version_gt '2.4.4' '2.3.99')"
+  assert_exit_code 1 "$(version_gt '2.3.99' '2.4.4')"
+  assert_exit_code 1 "$(version_gt '2.4.4' '2.4.4')"
+  assert_exit_code 0 "$(version_gt '2.4' '2.3.99')"
+  assert_exit_code 1 "$(version_gt '2.3.99' '2.4')"
+  assert_exit_code 1 "$(version_gt '2.4' '2.4')"
+  assert_exit_code 0 "$(version_gt 'v2.4.4' '2.3.99')"
+  assert_exit_code 1 "$(version_gt '2.3.99' 'v2.4.4')"
+  assert_exit_code 1 "$(version_gt 'v2.4.4' 'v2.4.4')"
+  assert_exit_code 0 "$(version_gt '2.4' 'v2.3.99')"
+  assert_exit_code 1 "$(version_gt 'v2.3.99' '2.4')"
+  assert_exit_code 1 "$(version_gt 'v2.4' '2.4')"
+
+  if version_gt '2.3.99' '2.4.0'; then
+    fail
+  fi
+  if ! version_gt '2.4.0' 'v2.3.99.99'; then
+    fail
+  fi
 }
 
 function test_run_hooks() {

diff --git a/...b/context/rootfs/usr/local/bin/install.sh → ...hp-fpm-common/shopware-web/bin/install.sh b/...b/context/rootfs/usr/local/bin/install.sh → ...hp-fpm-common/shopware-web/bin/install.sh
diff --git a/...text/rootfs/usr/local/bin/install_test.sh → ...m-common/shopware-web/bin/install_test.sh b/...text/rootfs/usr/local/bin/install_test.sh → ...m-common/shopware-web/bin/install_test.sh
diff --git a/...ontext/rootfs/usr/local/bin/post-start.sh → ...fpm-common/shopware-web/bin/post-start.sh b/...ontext/rootfs/usr/local/bin/post-start.sh → ...fpm-common/shopware-web/bin/post-start.sh
diff --git a/...t/rootfs/usr/local/bin/post-start_test.sh → ...ommon/shopware-web/bin/post-start_test.sh b/...t/rootfs/usr/local/bin/post-start_test.sh → ...ommon/shopware-web/bin/post-start_test.sh
diff --git a/.../context/rootfs/usr/local/bin/pre-stop.sh → ...p-fpm-common/shopware-web/bin/pre-stop.sh b/.../context/rootfs/usr/local/bin/pre-stop.sh → ...p-fpm-common/shopware-web/bin/pre-stop.sh
diff --git a/...ext/rootfs/usr/local/bin/pre-stop_test.sh → ...-common/shopware-web/bin/pre-stop_test.sh b/...ext/rootfs/usr/local/bin/pre-stop_test.sh → ...-common/shopware-web/bin/pre-stop_test.sh
diff --git a/...t/rootfs/usr/local/bin/stop-supervisor.sh → ...ommon/shopware-web/bin/stop-supervisor.sh b/...t/rootfs/usr/local/bin/stop-supervisor.sh → ...ommon/shopware-web/bin/stop-supervisor.sh
diff --git a/...web/context/rootfs/usr/local/bin/build.sh → ...php-fpm-common/wordpress-web/bin/build.sh b/...web/context/rootfs/usr/local/bin/build.sh → ...php-fpm-common/wordpress-web/bin/build.sh
diff --git a/...ontext/rootfs/usr/local/bin/build_test.sh → ...pm-common/wordpress-web/bin/build_test.sh b/...ontext/rootfs/usr/local/bin/build_test.sh → ...pm-common/wordpress-web/bin/build_test.sh
diff --git a/...ootfs/usr/local/bin/check-dependencies.sh → ...n/wordpress-web/bin/check-dependencies.sh b/...ootfs/usr/local/bin/check-dependencies.sh → ...n/wordpress-web/bin/check-dependencies.sh
diff --git a/.../usr/local/bin/check-dependencies_test.sh → ...dpress-web/bin/check-dependencies_test.sh b/.../usr/local/bin/check-dependencies_test.sh → ...dpress-web/bin/check-dependencies_test.sh
diff --git a/...context/rootfs/usr/local/bin/functions.sh → ...fpm-common/wordpress-web/bin/functions.sh b/...context/rootfs/usr/local/bin/functions.sh → ...fpm-common/wordpress-web/bin/functions.sh
diff --git a/...xt/rootfs/usr/local/bin/functions_test.sh → ...ommon/wordpress-web/bin/functions_test.sh b/...xt/rootfs/usr/local/bin/functions_test.sh → ...ommon/wordpress-web/bin/functions_test.sh
@@ -75,12 +75,25 @@ function test_app_path() {
 }
 
 function test_version_gt() {
-  assert_true "$(version_gt '2.4.4' '2.3.99')"
-  assert_false "$(version_gt '2.3.99' '2.4.4')"
-  assert_false "$(version_gt '2.4.4' '2.4.4')"
-  assert_true "$(version_gt '2.4' '2.3.99')"
-  assert_false "$(version_gt '2.3.99' '2.4')"
-  assert_false "$(version_gt '2.4' '2.4')"
+  assert_exit_code 0 "$(version_gt '2.4.4' '2.3.99')"
+  assert_exit_code 1 "$(version_gt '2.3.99' '2.4.4')"
+  assert_exit_code 1 "$(version_gt '2.4.4' '2.4.4')"
+  assert_exit_code 0 "$(version_gt '2.4' '2.3.99')"
+  assert_exit_code 1 "$(version_gt '2.3.99' '2.4')"
+  assert_exit_code 1 "$(version_gt '2.4' '2.4')"
+  assert_exit_code 0 "$(version_gt 'v2.4.4' '2.3.99')"
+  assert_exit_code 1 "$(version_gt '2.3.99' 'v2.4.4')"
+  assert_exit_code 1 "$(version_gt 'v2.4.4' 'v2.4.4')"
+  assert_exit_code 0 "$(version_gt '2.4' 'v2.3.99')"
+  assert_exit_code 1 "$(version_gt 'v2.3.99' '2.4')"
+  assert_exit_code 1 "$(version_gt 'v2.4' '2.4')"
+
+  if version_gt '2.3.99' '2.4.0'; then
+    fail
+  fi
+  if ! version_gt '2.4.0' 'v2.3.99.99'; then
+    fail
+  fi
 }
 
 function test_run_hooks() {

diff --git a/...b/context/rootfs/usr/local/bin/install.sh → ...p-fpm-common/wordpress-web/bin/install.sh b/...b/context/rootfs/usr/local/bin/install.sh → ...p-fpm-common/wordpress-web/bin/install.sh
diff --git a/...text/rootfs/usr/local/bin/install_test.sh → ...-common/wordpress-web/bin/install_test.sh b/...text/rootfs/usr/local/bin/install_test.sh → ...-common/wordpress-web/bin/install_test.sh
diff --git a/...ontext/rootfs/usr/local/bin/post-start.sh → ...pm-common/wordpress-web/bin/post-start.sh b/...ontext/rootfs/usr/local/bin/post-start.sh → ...pm-common/wordpress-web/bin/post-start.sh
diff --git a/...t/rootfs/usr/local/bin/post-start_test.sh → ...mmon/wordpress-web/bin/post-start_test.sh b/...t/rootfs/usr/local/bin/post-start_test.sh → ...mmon/wordpress-web/bin/post-start_test.sh
diff --git a/.../context/rootfs/usr/local/bin/pre-stop.sh → ...-fpm-common/wordpress-web/bin/pre-stop.sh b/.../context/rootfs/usr/local/bin/pre-stop.sh → ...-fpm-common/wordpress-web/bin/pre-stop.sh
diff --git a/...ext/rootfs/usr/local/bin/pre-stop_test.sh → ...common/wordpress-web/bin/pre-stop_test.sh b/...ext/rootfs/usr/local/bin/pre-stop_test.sh → ...common/wordpress-web/bin/pre-stop_test.sh
diff --git a/...t/rootfs/usr/local/bin/stop-supervisor.sh → ...mmon/wordpress-web/bin/stop-supervisor.sh b/...t/rootfs/usr/local/bin/stop-supervisor.sh → ...mmon/wordpress-web/bin/stop-supervisor.sh
diff --git a/images/php-fpm-rootless/base/context/rootfs/docker-entrypoint.sh b/images/php-fpm-rootless/base/context/rootfs/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-version_gt() { test "$(printf "%s\n" "$@" | sort -V | head -n 1)" != "$1"; }
+version_gt() { test "$(printf '%s\n' "${@#v}" | sort -V | head -n 1)" != "${1#v}"; }
 
 shopt -s expand_aliases
 if [ -f "${HOME}/.bash_alias" ]; then

diff --git a/images/php-fpm-rootless/magento2-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm-rootless/magento2-web/context/rootfs/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-version_gt() { test "$(printf "%s\n" "$@" | sort -V | head -n 1)" != "$1"; }
+version_gt() { test "$(printf '%s\n' "${@#v}" | sort -V | head -n 1)" != "${1#v}"; }
 
 shopt -s expand_aliases
 if [ -f "${HOME}/.bash_alias" ]; then

diff --git a/images/php-fpm-rootless/magento2-web/tpl.Dockerfile b/images/php-fpm-rootless/magento2-web/tpl.Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1
+# syntax=docker/dockerfile:1.7-labs
 {{- $BASE_IMAGE_NAME := getenv "BASE_IMAGE_NAME" "ubuntu" }}
 {{- $BASE_IMAGE_TAG := getenv "BASE_IMAGE_TAG" "jammy" }}
 ARG IMAGE_NAME="rewardenv/php-fpm"
@@ -32,7 +32,7 @@ ENV XDEBUG_CONNECT_BACK_HOST      '""'
 ENV WWWDATA_PASSWORD              ""
 
 COPY rootfs/. /
-COPY ../../php-fpm/magento2-web/context/rootfs/usr/local/bin/ /home/www-data/.local/bin/
+COPY --from=scripts --exclude=*_test.sh --chown=www-data:www-data --chmod=755 /bin/ /home/www-data/.local/bin/
 COPY --from=rewardenv/supervisord /usr/local/bin/supervisord /usr/bin/
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/images/php-fpm-rootless/shopware-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm-rootless/shopware-web/context/rootfs/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-version_gt() { test "$(printf "%s\n" "$@" | sort -V | head -n 1)" != "$1"; }
+version_gt() { test "$(printf '%s\n' "${@#v}" | sort -V | head -n 1)" != "${1#v}"; }
 
 shopt -s expand_aliases
 if [ -f "${HOME}/.bash_alias" ]; then

diff --git a/images/php-fpm-rootless/shopware-web/tpl.Dockerfile b/images/php-fpm-rootless/shopware-web/tpl.Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1
+# syntax=docker/dockerfile:1.7-labs
 {{- $BASE_IMAGE_NAME := getenv "BASE_IMAGE_NAME" "ubuntu" }}
 {{- $BASE_IMAGE_TAG := getenv "BASE_IMAGE_TAG" "jammy" }}
 ARG IMAGE_NAME="rewardenv/php-fpm"
@@ -32,7 +32,7 @@ ENV XDEBUG_CONNECT_BACK_HOST      '""'
 ENV WWWDATA_PASSWORD              ""
 
 COPY rootfs/. /
-COPY ../../php-fpm/shopware-web/context/rootfs/usr/local/bin/ /home/www-data/.local/bin/
+COPY --from=scripts --exclude=*_test.sh --chown=www-data:www-data --chmod=755 /bin/ /home/www-data/.local/bin/
 COPY --from=rewardenv/supervisord /usr/local/bin/supervisord /usr/bin/
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/images/php-fpm-rootless/wordpress-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm-rootless/wordpress-web/context/rootfs/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-version_gt() { test "$(printf "%s\n" "$@" | sort -V | head -n 1)" != "$1"; }
+version_gt() { test "$(printf '%s\n' "${@#v}" | sort -V | head -n 1)" != "${1#v}"; }
 
 shopt -s expand_aliases
 if [ -f "${HOME}/.bash_alias" ]; then

diff --git a/images/php-fpm-rootless/wordpress-web/tpl.Dockerfile b/images/php-fpm-rootless/wordpress-web/tpl.Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1
+# syntax=docker/dockerfile:1.7-labs
 {{- $BASE_IMAGE_NAME := getenv "BASE_IMAGE_NAME" "ubuntu" }}
 {{- $BASE_IMAGE_TAG := getenv "BASE_IMAGE_TAG" "jammy" }}
 ARG IMAGE_NAME="rewardenv/php-fpm"
@@ -32,7 +32,7 @@ ENV XDEBUG_CONNECT_BACK_HOST      '""'
 ENV WWWDATA_PASSWORD              ""
 
 COPY rootfs/. /
-COPY ../../php-fpm/wordpress-web/context/rootfs/usr/local/bin/ /home/www-data/.local/bin/
+COPY --from=scripts --exclude=*_test.sh --chown=www-data:www-data --chmod=755 /bin/ /home/www-data/.local/bin/
 COPY --from=rewardenv/supervisord /usr/local/bin/supervisord /usr/bin/
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/images/php-fpm-rootless/xdebug2/tpl.Dockerfile b/images/php-fpm-rootless/xdebug2/tpl.Dockerfile
@@ -22,7 +22,7 @@ RUN <<-EOF
       php${PHP_VERSION}-dev \
       php-pear \
       make
-    eval 'version_gt() { test "$(printf "%s\n" "$@" | sort -V | head -n 1)" != "$1"; }'
+    eval 'version_gt() { test "$(printf '%s\n' "${@#v}" | sort -V | head -n 1)" != "${1#v}"; }'
     if version_gt "${PHP_VERSION}" "6.99.99"; \
       then if version_gt "${PHP_VERSION}" "7.0.99"; \
         then pecl install -f xdebug-2.9.8; \