Run docker builds and tests as a regular user, take 5

chevah · Oct 11, 2024 · 3716b4e · 3716b4e
1 parent ef693f8
commit 3716b4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -34,9 +34,9 @@ jobs:
     - name: Alpine setup
       if: startsWith(matrix.container, 'alpine')
       run: |
-        /sbin/apk upgrade -U
-        /sbin/apk add git curl bash gcc make m4 patch musl-dev linux-headers lddtree shadow openssh-client file unzip perl g++ musl-locales dejagnu
-        /sbin/apk del util-linux-dev
+        apk upgrade -U
+        apk add git curl bash gcc make m4 patch musl-dev linux-headers lddtree shadow openssh-client file unzip perl g++ musl-locales dejagnu
+        apk del util-linux-dev
         curl --output /usr/local/bin/paxctl https://bin.chevah.com:20443/third-party-stuff/alpine/paxctl-3.12
         chmod +x /usr/local/bin/paxctl
 

diff --git a/pkg_checks.sh b/pkg_checks.sh
@@ -55,7 +55,7 @@ case "$OS" in
     linux*)
         if [ -x /sbin/apk ]; then
             # Assumes Alpine Linux 3.15.
-            CHECK_CMD=(apk info -q -e)
+            CHECK_CMD=(/sbin/apk info -q -e)
             PACKAGES="$APK_PKGS"
         elif [ -x /usr/bin/dpkg ]; then
             # Assumes Ubuntu Linux 16.04.