From 9c97c23c5ce37fa7254ec9b6a9effc42ff9f5dcf Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Tue, 5 Dec 2023 15:21:42 +0800 Subject: refactor: Move docker folder into utils Signed-off-by: KunoiSayami --- docker/.gitignore | 3 --- docker/README.md | 20 ------------------- docker/aarch64/dockerfile | 1 - docker/docker.env.default | 9 --------- docker/dockerbuild.sh | 50 ----------------------------------------------- docker/dockerfile | 47 -------------------------------------------- docker/entrypoint.sh | 9 --------- docker/initfolder.sh | 11 ----------- docker/onekey.sh | 19 ------------------ docker/repos/.placehold | 0 docker/x86_64/dockerfile | 1 - 11 files changed, 170 deletions(-) delete mode 100644 docker/.gitignore delete mode 100644 docker/README.md delete mode 100644 docker/aarch64/dockerfile delete mode 100644 docker/docker.env.default delete mode 100755 docker/dockerbuild.sh delete mode 100644 docker/dockerfile delete mode 100644 docker/entrypoint.sh delete mode 100755 docker/initfolder.sh delete mode 100755 docker/onekey.sh delete mode 100644 docker/repos/.placehold delete mode 100644 docker/x86_64/dockerfile (limited to 'docker') diff --git a/docker/.gitignore b/docker/.gitignore deleted file mode 100644 index 4170310..0000000 --- a/docker/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -docker.env -!docker.env.default -hook*.sh \ No newline at end of file diff --git a/docker/README.md b/docker/README.md deleted file mode 100644 index 3d216f6..0000000 --- a/docker/README.md +++ /dev/null @@ -1,20 +0,0 @@ -## Docker images (Not maintenance) - -### Usage - -Choose your architecture (such as `aarch64`) - -```plain -$ cd aarch64 -$ sudo docker build . -t repobuildbase -$ cd .. -$ sudo docker build . -t repobuild -``` - -Or you can use `onekey.sh` to build it. - -Then, start image - -```plain -$ sudo docker run -it --rm --env-file docker.env repobuild -``` diff --git a/docker/aarch64/dockerfile b/docker/aarch64/dockerfile deleted file mode 100644 index 2ec90e6..0000000 --- a/docker/aarch64/dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM lopsided/archlinux \ No newline at end of file diff --git a/docker/docker.env.default b/docker/docker.env.default deleted file mode 100644 index f8e35b6..0000000 --- a/docker/docker.env.default +++ /dev/null @@ -1,9 +0,0 @@ -GPG_PRIV_KEY= -REMOTE_PATH= -UPLOAD_TOKEN= -CHECKOUT_BRANCH=master -#REMOTE_DATABASE= -#BUILD_OVERRIDE= -# Only check if env is set -#FORCE_BUILD_ALL= -#BUILD_FAIL_FAST= diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh deleted file mode 100755 index c47860b..0000000 --- a/docker/dockerbuild.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -set -Eeuo pipefail -sudo pacman -Sy - -cd /home/build - -if [ -f ./hook-run.sh ]; then - . ./hook-run.sh -fi - -if [ ! -d repos ]; then - git clone --depth=3 $1 repos - - - pushd repos - git checkout "$CHECKOUT_BRANCH" - git fetch --recurse-submodules -j2 - git submodule update --init - popd -fi - -export DOCKER_SETUP_SCRIPT=1 - - -if [ $UID -eq 0 ]; then - chown -R build:build repos - - echo "$TARGET_HOSTS" | base64 -d >> /etc/hosts -else - echo "$TARGET_HOSTS" | base64 -d | sudo tee -a /etc/hosts >/dev/null -fi - -pushd repos -if [ $UID -eq 0 ]; then - - su -c "echo $GPG_PRIV_KEY | base64 -d | gpg --import" build - - su -c './utils/pkgbuild_bootstrap' build - -else - - echo $GPG_PRIV_KEY | base64 -d | gpg --import - - ./utils/pkgbuild_bootstrap - -fi - -popd - diff --git a/docker/dockerfile b/docker/dockerfile deleted file mode 100644 index 78d8cdf..0000000 --- a/docker/dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM repobuildbase:latest - -ARG REMOTE_ADDRESS - -RUN echo -n -e '\n[kunoisayami]\nServer = ' >> /etc/pacman.conf - -RUN echo ${REMOTE_ADDRESS} >> /etc/pacman.conf - -RUN pacman-key --init - -RUN curl -fL https://keys.openpgp.org/vks/v1/by-fingerprint/4A0F0C8BC709ACA4341767FB243975C8DB9656B9 | pacman-key --add - - -RUN pacman-key --finger 4A0F0C8BC709ACA4341767FB243975C8DB9656B9 - -RUN pacman-key --lsign-key 4A0F0C8BC709ACA4341767FB243975C8DB9656B9 - -RUN useradd -m build - -COPY 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 - -RUN pacman --noconfirm --needed -Sy archlinux-keyring - -RUN pacman --noconfirm --needed -Su base-devel gnupg git yay - -RUN pacman --noconfirm --needed -S python python-aiohttp python-aiofiles python-aiohttp-socks python-asycio-timeout moreutils - -RUN echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers - -ADD repos /home/build/repos - -COPY dockerbuild.sh entrypoint.sh /home/build/ - -RUN /home/build/initfolder.sh - -RUN if [ -r /home/build/hook-99.sh ]; then /home/build/hook-99.sh; fi - -USER build - -# ENTRYPOINT ["bash", "-c", "/home/build/repos/utils/pkgbuild_bootstrap"] - -ENTRYPOINT ["bash", "-c", "/home/build/entrypoint.sh"] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh deleted file mode 100644 index 6823c87..0000000 --- a/docker/entrypoint.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ -z "$1" ]; then - REMOTE_REPOSITORY="$1"; -else - REMOTE_REPOSITORY=https://github.com/kunoisayami/repos -fi - -/home/build/dockerbuild.sh $REMOTE_REPOSITORY \ No newline at end of file diff --git a/docker/initfolder.sh b/docker/initfolder.sh deleted file mode 100755 index 39a652f..0000000 --- a/docker/initfolder.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if [ -f /home/build/repos/.placehold ]; then - rm /home/build/repos/.placehold -fi - -find /home/build/repos -maxdepth 0 -empty -exec rm -rf {} \; - -if [ -d /home/build/repos ]; then - chown -R build:build /home/build/repos -fi \ No newline at end of file diff --git a/docker/onekey.sh b/docker/onekey.sh deleted file mode 100755 index 757b289..0000000 --- a/docker/onekey.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# end up when failed -set -Eeuo pipefail - -if [ $# -eq 0 ] && [ -z "$1" ]; then - echo "Please specify REMOTE SERVER ADDRESS" - exit 1 -fi - -pushd "$(uname -m)" || ( echo "Can't find your architecture" && exit 1 ) - docker buildx build . -t repobuildbase -popd - -if [ -v http_proxy ]; then - docker buildx build --build-arg "REMOTE_ADDRESS=$1" --build-arg="http_proxy=$http_proxy" --build-arg="https_proxy=$http_proxy" . -t repobuild; -else - docker buildx build --build-arg "REMOTE_ADDRESS=$1" . -t repobuild; -fi diff --git a/docker/repos/.placehold b/docker/repos/.placehold deleted file mode 100644 index e69de29..0000000 diff --git a/docker/x86_64/dockerfile b/docker/x86_64/dockerfile deleted file mode 100644 index 6f7a91e..0000000 --- a/docker/x86_64/dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM archlinux \ No newline at end of file -- cgit v1.3.1