diff --git a/resources/build.sh b/resources/build.sh index 719d48a..1011c60 100755 --- a/resources/build.sh +++ b/resources/build.sh @@ -4,23 +4,23 @@ function build() { local DOCKERFILE=$1 echo "build $DOCKERFILE" if [[ $DOCKERFILE == *"act_runner.dockerfile" ]]; then - docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/act_runner:0.2.10 . + 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 elif [[ $DOCKERFILE == *"nanopb.dockerfile" ]]; then - docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/nanopb:0.3.9.3 . + 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 elif [[ $DOCKERFILE == *"ubuntu2404.dockerfile" ]]; then - docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 . + docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 . docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 elif [[ $DOCKERFILE == *"ubuntu2204.dockerfile" ]]; then - docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:22.04 . + docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:22.04 . docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:22.04 elif [[ $DOCKERFILE == *"ubuntu1604.dockerfile" ]]; then - docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:16.04 . + docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:16.04 . docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:16.04 elif [[ $DOCKERFILE == *"frpc.dockerfile" ]]; then FRP_VERSION=$(grep 'ENV FRP_VERSION' frpc.dockerfile | awk '{print $3}') - docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION . + docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION . docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION else echo "not found steps for build $DOCKERFILE ..." diff --git a/ubuntu2204.dockerfile b/ubuntu2204.dockerfile index 8793653..3386c0d 100644 --- a/ubuntu2204.dockerfile +++ b/ubuntu2204.dockerfile @@ -40,8 +40,8 @@ RUN cd /root \ && echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:$LD_LIBRARY_PATH' >> /etc/profile \ && rm -fr /root/boost_1_86_0* -RUN cd /root \ - && git clone --depth=1 --recursive https://gitea.amass.fun/amass/ZLMediaKit.git \ + RUN cd /root \ + && git clone --depth=1 --recursive https://github.com/ZLMediaKit/ZLMediaKit.git \ && cd /root/ZLMediaKit \ && apt install -y libsrtp2-dev libusrsctp-dev \ && cmake -G Ninja -B build -S . -DENABLE_OPENSSL=true -DENABLE_WEBRTC=true -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/opt/Libraries/ZLMediaKit" \