Compare commits

..

2 Commits

6 changed files with 55 additions and 2 deletions

46
.github/workflows/regress.yml vendored Normal file
View File

@ -0,0 +1,46 @@
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

View File

@ -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

View File

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

View File

@ -136,6 +136,7 @@ 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"]

3
docker/entrypoint-web.sh Executable file
View File

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

View File

@ -57,6 +57,9 @@ 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