From 96b259728e6bd21d69824221f6949589ef60ff0a Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Thu, 9 Dec 2021 23:41:11 +0800 Subject: feat(docker): Support change branch via environment Signed-off-by: KunoiSayami --- docker/.gitignore | 1 + docker/docker.env.default | 1 + docker/dockerbuild.sh | 1 + docker/dockerfile | 4 +++- 4 files changed, 6 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/.gitignore b/docker/.gitignore index cb288c2..144fcea 100644 --- a/docker/.gitignore +++ b/docker/.gitignore @@ -1,2 +1,3 @@ docker.env !docker.env.default +hook.sh \ No newline at end of file diff --git a/docker/docker.env.default b/docker/docker.env.default index b8b5667..14c7976 100644 --- a/docker/docker.env.default +++ b/docker/docker.env.default @@ -1,3 +1,4 @@ GPG_PRIV_KEY= REMOTE_PATH= UPLOAD_TOKEN= +CHECKOUT_BRANCH=master \ No newline at end of file diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh index 107adc0..5fd0130 100755 --- a/docker/dockerbuild.sh +++ b/docker/dockerbuild.sh @@ -6,6 +6,7 @@ cd /home/build git clone --depth=3 https://github.com/kunoisayami/repos pushd repos +git checkout $CHECKOUT_BRANCH git submodule update --init popd diff --git a/docker/dockerfile b/docker/dockerfile index 7ad5367..f26efa6 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -24,7 +24,9 @@ RUN useradd -m build RUN echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers -COPY dockerbuild.sh /home/build/ +COPY dockerbuild.sh hook.sh* /home/build/ + +RUN if [ -r /home/build/hook.sh ]; then /home/build/hook.sh; fi USER build -- cgit v1.3.1