From 496086b8f378d542b6d92ed63d9f16360da0c8f3 Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Sat, 10 Jun 2023 04:21:32 +0800 Subject: feat(build): Add a way to check directory is empty Signed-off-by: KunoiSayami --- docker/dockerbuild.sh | 2 +- docker/dockerfile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh index 00b2250..52a9851 100755 --- a/docker/dockerbuild.sh +++ b/docker/dockerbuild.sh @@ -4,7 +4,7 @@ set -Eeuo pipefail sudo pacman -Sy cd /home/build -if [ ! -d repos ]; then +if [ ! -d repos ] || [ $(ls -A repos) ]; then git clone --depth=3 https://github.com/kunoisayami/repos diff --git a/docker/dockerfile b/docker/dockerfile index d771945..13a79f7 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -16,7 +16,7 @@ RUN pacman-key --lsign-key 4A0F0C8BC709ACA4341767FB243975C8DB9656B9 RUN useradd -m build -COPY dockerbuild.sh initfolder.sh hook.sh* /home/build/ +COPY initfolder.sh hook.sh* /home/build/ RUN if [ -r /home/build/hook.sh ]; then /home/build/hook.sh; fi @@ -34,6 +34,8 @@ RUN echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers ADD repos /home/build/repos +COPY dockerbuild.sh /home/build/ + RUN /home/build/initfolder.sh USER build -- cgit v1.3.1