From 8aa2177d248e0a8d35ceb9355cc1d92f90a85aa0 Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Tue, 25 Oct 2022 02:01:42 +0800 Subject: fix(script): Fix typo * feat(docker): Add missing dependency * fix(pkg): Add GPG key for ffmpeg-cuda Signed-off-by: KunoiSayami --- docker/dockerbuild.sh | 12 +++++------- docker/dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'docker') diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh index 091dca8..add31c5 100755 --- a/docker/dockerbuild.sh +++ b/docker/dockerbuild.sh @@ -7,11 +7,13 @@ cd /home/build git clone --depth=3 https://github.com/kunoisayami/repos pushd repos -git checkout $CHECKOUT_BRANCH +git checkout "$CHECKOUT_BRANCH" git fetch --recurse-submodules -j2 git submodule update --init popd +export DOCKER_SETUP_SCRIPT=1 + if [ $UID -eq 0 ]; then chown -R build:build repos @@ -26,17 +28,13 @@ if [ $UID -eq 0 ]; then su -c "echo $GPG_PRIV_KEY | base64 -d | gpg --import" build - su -c './utils/pkgbuild.sh' build - - su -e -c './utils/ci-upload.sh' build + su -c './utils/pkgbuild_bootstrap' build else echo $GPG_PRIV_KEY | base64 -d | gpg --import - ./utils/pkgbuild.sh - - ./utils/ci-upload.sh + ./utils/pkgbuild_bootstrap fi diff --git a/docker/dockerfile b/docker/dockerfile index 372fdd3..d7b613d 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -26,10 +26,10 @@ RUN if [ ! -r /home/build/hook.sh ]; then reflector --save /etc/pacman.d/mirrorl RUN pacman --noconfirm --needed -Sy archlinux-keyring -RUN pacman --noconfirm --needed -Su base-devel gnupg git yay +RUN pacman --noconfirm --needed -Su base-devel gnupg git yay python python-aiohttp python-aiofiles RUN echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers USER build -ENTRYPOINT ["bash", "-c", "/home/build/dockerbuild.sh"] +ENTRYPOINT ["bash", "-c", "/home/build/repos/utils/ng/pkgbuild_bootstrap"] -- cgit v1.3.1