multi-arch-test-build: unify Dockerfile and script paths

Use a similar path structure to other workflows.

Add ci_helpers through the Dockerfile.
Change CI_HELPER to CI_HELPERS
Remove unused volume.

Signed-off-by: George Sapkin <george@sapk.in>

Author: GeorgeSapkin

.github/dockerfiles/Dockerfile.feeds

@@ -0,0 +1,7 @@
+ARG ARCH=x86-64
+FROM openwrt/rootfs:$ARCH
+
+ADD scripts/ci_helpers.sh /scripts/ci_helpers.sh
+ADD scripts/test_entrypoint.sh /scripts/test_entrypoint.sh
+
+CMD ["/scripts/test_entrypoint.sh"]

.github/dockerfiles_feeds/Dockerfile

@@ -15,7 +15,7 @@ elif [ $PKG_MANAGER = "apk" ]; then
 	apk update
 fi
 
-CI_HELPER="${CI_HELPER:-/ci/.github/workflows/ci_helpers.sh}"
+CI_HELPERS="${CI_HELPERS:-/scripts/ci_helpers.sh}"
 
 for PKG in /ci/*.[ai]pk; do
 	if [ $PKG_MANAGER = "opkg" ]; then
@@ -55,7 +55,7 @@ for PKG in /ci/*.[ai]pk; do
 		continue
 	fi
 
-	export PKG_NAME PKG_VERSION CI_HELPER
+	export PKG_NAME PKG_VERSION CI_HELPERS
 
 	if [ -f "$PRE_TEST_SCRIPT" ]; then
 		echo "Use package specific pre-test.sh"

.github/dockerfiles_feeds/entrypoint.sh .github/scripts/test_entrypoint.sh.github/dockerfiles_feeds/entrypoint.sh renamed to .github/scripts/test_entrypoint.sh

@@ -213,31 +213,36 @@ jobs:
           sudo apt-get install -y qemu-user-static binfmt-support
           sudo update-binfmts --import
 
-      - name: Checkout
+      - name: Checkout test scripts
         if: ${{ matrix.runtime_test && fromJSON(env.HAVE_PKGS) }}
         uses: actions/checkout@v6
         with:
           repository: openwrt/actions-shared-workflows
-          path: dockerfiles_feeds
+          path: workflow_context
           sparse-checkout: |
             .github/scripts/ci_helpers.sh
-            .github/dockerfiles_feeds/Dockerfile
-            .github/dockerfiles_feeds/entrypoint.sh
+            .github/dockerfiles/Dockerfile.feeds
+            .github/scripts/test_entrypoint.sh
           sparse-checkout-cone-mode: false
 
       - name: Build Docker container
         if: ${{ matrix.runtime_test && fromJSON(env.HAVE_PKGS) }}
         run: |
-          docker build --platform linux/${{ matrix.arch }} -t test-container \
-            --build-arg ARCH dockerfiles_feeds/.github/dockerfiles_feeds/
+          docker build \
+            --build-arg ARCH \
+            --file workflow_context/.github/dockerfiles/Dockerfile.feeds \
+            --platform linux/${{ matrix.arch }} \
+            --tag test-container \
+            workflow_context/.github
         env:
           ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
 
       - name: Test via Docker container
         if: ${{ matrix.runtime_test && fromJSON(env.HAVE_PKGS) }}
         run: |
-          docker run --platform linux/${{ matrix.arch }} --rm -v $GITHUB_WORKSPACE:/ci \
-            -v $GITHUB_WORKSPACE/dockerfiles_feeds:/dockerfiles_feeds \
-            -e CI_HELPER=/dockerfiles_feeds/scripts/ci_helpers.sh \
+          docker run \
             -e PKG_MANAGER=${{ env.PKG_MANAGER }} \
+            --platform linux/${{ matrix.arch }} \
+            --rm \
+            --volume $GITHUB_WORKSPACE:/ci \
             test-container