From c5231e2bf3a0dece1ebaef60ce63d76859847136 Mon Sep 17 00:00:00 2001
From: camer0n <e107inc@gmail.com>
Date: Wed, 17 Apr 2024 11:42:32 -0700
Subject: [PATCH] Potential fix for acceptance workflow.

---
 .github/workflows/test-acceptance.yml | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test-acceptance.yml b/.github/workflows/test-acceptance.yml
index 3cecf345e1..b88806aa58 100644
--- a/.github/workflows/test-acceptance.yml
+++ b/.github/workflows/test-acceptance.yml
@@ -1,9 +1,7 @@
 name: Acceptance Tests
-
 on:
   push:
   pull_request:
-
 jobs:
   test-acceptance:
     strategy:
@@ -13,27 +11,24 @@ jobs:
           - image: docker.io/jrei/systemd-ubuntu:20.04
           - image: docker.io/jrei/systemd-ubuntu:22.04
     runs-on: ubuntu-latest
-
     steps:
-      - name: Replace Docker with Podman
-        run: sudo apt-get -o Dpkg::Options::="--force-overwrite" install -y podman-docker
-
+      - name: Replace Docker with Podman Rootless
+        run: |
+          sudo apt-get -o Dpkg::Options::="--force-overwrite" install -y podman
+          echo -e "export XDG_RUNTIME_DIR=/tmp/${RUNNER_TEMP}" >> $GITHUB_ENV
+          echo -e "export XDG_DATA_HOME=/tmp/${RUNNER_TEMP}" >> $GITHUB_ENV
+          echo -e "export CONTAINERS_STORAGE_CONF=/tmp/${RUNNER_TEMP}/storage.conf" >> $GITHUB_ENV
       - uses: actions/setup-go@v3
         with:
           go-version: "^1.19"
-
       - uses: actions/checkout@v3
-
       - name: Compile SaltStack bootstrap wrapper
         run: CGO_ENABLED=0 go build -ldflags "-s -w" -o ./salt-bootstrap salt-bootstrap.go
         working-directory: ./e107_tests/lib/ci/salt/
-
       - name: Launch test container
         run: docker run -d -it --rm --name target -v .:/app/ ${{ matrix.operating_system.image }}
-
       - name: Install SaltStack
         run: docker exec target /app/e107_tests/lib/ci/salt/salt-bootstrap onedir
-
       - name: Apply Salt state
         run: |
           ln -v -s master minion
@@ -47,18 +42,14 @@ jobs:
             salt-call -c ./ --id=e107-dev --local state.apply e107-dev
           "
         working-directory: ./e107_tests/lib/ci/salt/
-
       - name: Install test dependencies
         run: |
           docker exec -w /app/e107_tests/ -e COMPOSER_ALLOW_SUPERUSER=1 target \
           composer update --prefer-dist --no-progress
-
       - name: Download Git submodule dependencies
         run: git submodule update --init --recursive --remote
-
       - name: Install the CI test configuration file
         run: |
           ln -v -s -f ./lib/ci/config.acceptance.ci.yml ./e107_tests/config.yml
-
       - name: Run acceptance tests
         run: docker exec -w /app/e107_tests/ target php ./vendor/bin/codecept run acceptance --steps
\ No newline at end of file