diff --git a/act_runner.dockerfile b/act_runner.dockerfile index 3bd3550..51df444 100644 --- a/act_runner.dockerfile +++ b/act_runner.dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="amass <168062547@qq.com>" ENV DEBIAN_FRONTEND=noninteractive -ENV ACT_VERSION 0.2.10 +ENV ACT_VERSION 0.2.11 RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.ustc.edu.cn@g' /etc/apt/sources.list.d/ubuntu.sources \ && apt update \ @@ -23,5 +23,5 @@ COPY resources/act_runner.sh /opt/act/run.sh ENTRYPOINT ["tini","--","/opt/act/run.sh"] -# docker build --progress tty -f act_runner.dockerfile -t frp-by1.wwvvww.cn:45288/act_runner:0.2.10 . -# docker push frp-by1.wwvvww.cn:45288/act_runner:0.2.10 \ No newline at end of file +# docker build --progress tty -f act_runner.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/act_runner:0.2.11 . +# docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/act_runner:0.2.11 \ No newline at end of file diff --git a/resources/build.sh b/resources/build.sh index 1011c60..913235f 100755 --- a/resources/build.sh +++ b/resources/build.sh @@ -4,8 +4,9 @@ function build() { local DOCKERFILE=$1 echo "build $DOCKERFILE" if [[ $DOCKERFILE == *"act_runner.dockerfile" ]]; then - docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/act_runner:0.2.10 . - docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/act_runner:0.2.10 + ACT_RUNNER_VERSION=$(grep 'ENV ACT_VERSION' act_runner.dockerfile | awk '{print $3}') + docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/act_runner:$ACT_RUNNER_VERSION . + docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/act_runner:$ACT_RUNNER_VERSION elif [[ $DOCKERFILE == *"nanopb.dockerfile" ]]; then docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/nanopb:0.3.9.3 . docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/nanopb:0.3.9.3