diff --git a/.github/workflows/setup.sh b/.github/workflows/setup.sh index 29d2879a..a6acc660 100755 --- a/.github/workflows/setup.sh +++ b/.github/workflows/setup.sh @@ -12,7 +12,7 @@ pacman -Syu --noconfirm # main dependencies pacman -Sy --noconfirm devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo python-systemd sudo # make dependencies -pacman -Sy --noconfirm python-build python-flit python-installer python-tox python-wheel +pacman -Sy --noconfirm --asdeps base-devel python-build python-flit python-installer python-tox python-wheel # optional dependencies if [[ -z $MINIMAL_INSTALL ]]; then # VCS support @@ -36,6 +36,9 @@ sudo -u nobody -- makepkg --packagelist | grep -v -- -debug- | pacman -U --nocon # create machine-id which is required by build tools systemd-machine-id-setup +# remove unused dependencies +pacman -Qdtq | pacman -Rscn --noconfirm - + # initial setup command as root [[ -z $MINIMAL_INSTALL ]] && WEB_ARGS=("--web-port" "8080") ahriman -a x86_64 -r "github" service-setup --packager "ahriman bot " "${WEB_ARGS[@]}" @@ -50,7 +53,7 @@ if [[ -z $MINIMAL_INSTALL ]]; then WEB_PID=$! fi # add the first package -sudo -u ahriman -- ahriman package-add --now ahriman +sudo -u ahriman -- ahriman --log-handler console package-add --now ahriman # check if package was actually installed test -n "$(find "/var/lib/ahriman/repository/github/x86_64" -name "ahriman*pkg*")" # run package check diff --git a/Dockerfile b/Dockerfile index d293de19..0908cf01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,9 +33,9 @@ COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package" ## install package dependencies ## darcs is not installed by reasons, because it requires a lot haskell packages which dramatically increase image size RUN pacman -Sy --noconfirm --asdeps devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo && \ - pacman -Sy --noconfirm --asdeps python-build python-flit python-installer python-wheel && \ + pacman -Sy --noconfirm --asdeps base-devel python-build python-flit python-installer python-wheel && \ pacman -Sy --noconfirm --asdeps breezy git mercurial python-aiohttp python-boto3 python-cryptography python-jinja python-requests-unixsocket python-systemd rsync subversion && \ - runuser -u build -- install-aur-package python-aioauth-client python-aiohttp-apispec-git python-aiohttp-cors \ + runuser -u build -- install-aur-package python-aioauth-client python-webargs python-aiohttp-apispec-git python-aiohttp-cors \ python-aiohttp-jinja2 python-aiohttp-session python-aiohttp-security ## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container diff --git a/docker/install-aur-package.sh b/docker/install-aur-package.sh index 5d4f491c..433bdfcc 100755 --- a/docker/install-aur-package.sh +++ b/docker/install-aur-package.sh @@ -6,7 +6,7 @@ for PACKAGE in "$@"; do BUILD_DIR="$(mktemp -d)" git clone https://aur.archlinux.org/"$PACKAGE".git "$BUILD_DIR" cd "$BUILD_DIR" - makepkg --noconfirm --install --rmdeps --syncdeps + makepkg --nocheck --noconfirm --install --rmdeps --syncdeps cd / rm -r "$BUILD_DIR" done