From 582e844cbd25280a72bd6ac5ce4c8530a389ea4a Mon Sep 17 00:00:00 2001
From: KunoiSayami <i@leanhe.dev>
Date: Fri, 15 Sep 2023 02:50:05 +0800
Subject: feat(docker): Support proxy * feat(hook): Add hook script for cinny

Signed-off-by: KunoiSayami <i@leanhe.dev>
---
 docker/.gitignore     | 2 +-
 docker/dockerbuild.sh | 2 +-
 docker/dockerfile     | 4 +++-
 docker/onekey.sh      | 9 +++++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'docker')

diff --git a/docker/.gitignore b/docker/.gitignore
index 144fcea..4170310 100644
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -1,3 +1,3 @@
 docker.env
 !docker.env.default
-hook.sh
\ No newline at end of file
+hook*.sh
\ No newline at end of file
diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh
index 52a9851..650c1db 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 ] || [ $(ls -A 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 13a79f7..dcef1bb 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -16,7 +16,7 @@ RUN pacman-key --lsign-key 4A0F0C8BC709ACA4341767FB243975C8DB9656B9
 
 RUN useradd -m build
 
-COPY 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
 
@@ -38,6 +38,8 @@ COPY dockerbuild.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"]
diff --git a/docker/onekey.sh b/docker/onekey.sh
index 99384db..757b289 100755
--- a/docker/onekey.sh
+++ b/docker/onekey.sh
@@ -9,6 +9,11 @@ if [ $# -eq 0 ] && [ -z "$1" ]; then
 fi
 
 pushd "$(uname -m)" || ( echo "Can't find your architecture" && exit 1 )
-docker build . -t repobuildbase
+    docker buildx build . -t repobuildbase
 popd
-docker build --build-arg "REMOTE_ADDRESS=$1" . -t repobuild
+
+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
-- 
cgit v1.3.1