From 19520d7b1642cb47a01e906f03801c1ce0774ab9 Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Wed, 26 Oct 2022 01:58:41 +0800 Subject: feat(script): Optimize local debug docker build * fix(ci): Fix gitlab ci script Signed-off-by: KunoiSayami --- docker/dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docker/dockerfile') diff --git a/docker/dockerfile b/docker/dockerfile index bbc682f..d771945 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -2,12 +2,6 @@ FROM repobuildbase:latest ARG REMOTE_ADDRESS -RUN useradd -m build - -COPY dockerbuild.sh hook.sh* /home/build/ - -RUN if [ -r /home/build/hook.sh ]; then /home/build/hook.sh; fi - RUN echo -n -e '\n[kunoisayami]\nServer = ' >> /etc/pacman.conf RUN echo ${REMOTE_ADDRESS} >> /etc/pacman.conf @@ -20,6 +14,12 @@ RUN pacman-key --finger 4A0F0C8BC709ACA4341767FB243975C8DB9656B9 RUN pacman-key --lsign-key 4A0F0C8BC709ACA4341767FB243975C8DB9656B9 +RUN useradd -m build + +COPY dockerbuild.sh initfolder.sh hook.sh* /home/build/ + +RUN if [ -r /home/build/hook.sh ]; then /home/build/hook.sh; fi + RUN if [ ! -r /home/build/hook.sh ]; then pacman --noconfirm --needed -Sy reflector; fi RUN if [ ! -r /home/build/hook.sh ]; then reflector --save /etc/pacman.d/mirrorlist --latest 2 --sort rate; fi @@ -32,9 +32,9 @@ RUN pacman --noconfirm --needed -S python python-aiohttp python-aiofiles moreut RUN echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers -# ADD repos /home/build/repos +ADD repos /home/build/repos -# RUN chown -R build:build /home/build/repos +RUN /home/build/initfolder.sh USER build -- cgit v1.3.1