From 54e9479d05212904c5dcb82a7ef20081181202a7 Mon Sep 17 00:00:00 2001
From: amass <amass.law1996@gmail.com>
Date: Fri, 22 Nov 2024 23:42:35 +0800
Subject: [PATCH] correct docker build.

---
 Dockerfiles/ubuntu2204.dockerfile |  2 +-
 Dockerfiles/ubuntu2404.dockerfile |  2 +-
 resources/build.sh                | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfiles/ubuntu2204.dockerfile b/Dockerfiles/ubuntu2204.dockerfile
index 25cd848..9fcd8b9 100644
--- a/Dockerfiles/ubuntu2204.dockerfile
+++ b/Dockerfiles/ubuntu2204.dockerfile
@@ -146,5 +146,5 @@ ENV TERM=xterm-256color
 ENTRYPOINT ["/usr/bin/tini", "--"]
 CMD ["bash", "-c", "service ssh start && code-server --bind-addr 0.0.0.0:8087"]
 
-# docker build --progress=tty -f ubuntu2204.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:22.04 .
+# docker build --no-cache --progress=tty -f ubuntu2204.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 
\ No newline at end of file
diff --git a/Dockerfiles/ubuntu2404.dockerfile b/Dockerfiles/ubuntu2404.dockerfile
index de06116..88c674d 100644
--- a/Dockerfiles/ubuntu2404.dockerfile
+++ b/Dockerfiles/ubuntu2404.dockerfile
@@ -133,5 +133,5 @@ ENV TERM=xterm-256color
 ENTRYPOINT ["/usr/bin/tini", "--"]
 CMD ["bash", "-c", "service ssh start && code-server --bind-addr 0.0.0.0:8087"]
 
-# docker build --progress=tty -f ubuntu2404.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 .
+# docker build --no-cache --progress=tty -f ubuntu2404.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
\ No newline at end of file
diff --git a/resources/build.sh b/resources/build.sh
index 7ed672f..2c6f65b 100755
--- a/resources/build.sh
+++ b/resources/build.sh
@@ -85,26 +85,26 @@ function build_docker_images(){
     echo "build $DOCKERFILE"
     if [[ $DOCKERFILE == *"act_runner.dockerfile" ]]; then
         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 build --no-cache --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 build --no-cache --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 --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 .
+        docker build --no-cache --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 --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:22.04 .
+        docker build --no-cache --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 --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:16.04 .
+        docker build --no-cache --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' $DOCKERFILE | awk '{print $3}')
-        docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION .
+        docker build --no-cache --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
     elif [[ $DOCKERFILE == *"yoctools.dockerfile" ]]; then
-        docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04 .
+        docker build --no-cache --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04 .
         docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04
     else
         echo "not found steps for build $DOCKERFILE ..."