.github/workflows/regress.yml

@@ -1,46 +0,0 @@
-name: Regress
-
-on: workflow_dispatch
-
-jobs:
-  run-regress-tests:
-
-    runs-on: ubuntu-latest
-
-    services:
-      ahriman:
-        image: arcan1s/ahriman:edge
-        env:
-          AHRIMAN_PORT: 8080
-          AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman-web.sock
-        options: --privileged -w /build --entrypoint entrypoint-web
-        ports:
-          - 8080
-        volumes:
-          - repo:/var/lib/ahriman
-
-    container:
-      image: arcan1s/ahriman:edge
-      env:
-        AHRIMAN_DEBUG: y
-        AHRIMAN_OUTPUT: console
-        AHRIMAN_PORT: 8080
-        AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman-web.sock
-      options: --privileged
-      volumes:
-        - repo:/var/lib/ahriman
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Create user
-        run: user-add test -p test -R full
-
-      - name: Fetch users
-        run: user-list
-
-      - name: Add package
-        run: package-add --now ahriman
-
-      - name: Update packages
-        run: repo-update

.github/workflows/setup.yml

@@ -15,9 +15,9 @@ jobs:
 
     container:
       image: archlinux:base
-      options: --privileged -w /build
       volumes:
         - ${{ github.workspace }}:/build
+      options: --privileged -w /build
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/tests.yml

@@ -17,9 +17,9 @@ jobs:
 
     container:
       image: archlinux:base
-      options: -w /build
       volumes:
         - ${{ github.workspace }}:/build
+      options: -w /build
 
     steps:
       - uses: actions/checkout@v3

docker/Dockerfile

@@ -136,7 +136,6 @@ VOLUME ["/var/lib/ahriman"]
 COPY "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
 ## entrypoint setup
 COPY "docker/entrypoint.sh" "/usr/local/bin/entrypoint"
-COPY "docker/entrypoint-web.sh" "/usr/local/bin/entrypoint-web"
 ENTRYPOINT ["entrypoint"]
 # default command
 CMD ["repo-update", "--refresh"]

docker/entrypoint-web.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec entrypoint web

docker/entrypoint.sh

@@ -57,9 +57,6 @@ ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-setup "${AHRIMAN_SETUP_ARGS[@]}"
 # create machine-id which is required by build tools
 systemd-machine-id-setup &> /dev/null
 
-# special workaround to emulate /bin/bash entrypoint if first argument starts with /
-[[ "$1" =~ ^/.* ]] && exec "$@"
-
 # if AHRIMAN_FORCE_ROOT is set or command is unsafe we can run without sudo
 # otherwise we prepend executable by sudo command
 if [ -n "$AHRIMAN_FORCE_ROOT" ]; then