[PATCH v3 compass-ci 2/5] container: call docker_skip_rebuild()

7 Feb 2021

diff --git a/container/add-software/build b/container/add-software/build
index 234c8b9..bc3c95a 100755
--- a/container/add-software/build
+++ b/container/add-software/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "addsoftware:auto"
+
 docker build -t addsoftware:auto .
diff --git a/container/alpine/build b/container/alpine/build
index bd277c3..3168799 100755
--- a/container/alpine/build
+++ b/container/alpine/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "alpine:testbed"
+
 docker build -t alpine:testbed .
diff --git a/container/archlinux/build b/container/archlinux/build
index 9749489..6db5a68 100755
--- a/container/archlinux/build
+++ b/container/archlinux/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "archlinux:testbed"
+
 docker build --build-arg ARCH=$(arch) -t archlinux:testbed .
diff --git a/container/assign-account/build b/container/assign-account/build
index 3984341..480c410 100755
--- a/container/assign-account/build
+++ b/container/assign-account/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "assign-account:latest"
+
 docker build -t assign-account:latest .
diff --git a/container/assist-result/build b/container/assist-result/build
index 130127b..600b80a 100755
--- a/container/assist-result/build
+++ b/container/assist-result/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "assist-result"
+
 docker build -t assist-result .
diff --git a/container/assistant/build b/container/assistant/build
index 7778c9f..89a8a97 100755
--- a/container/assistant/build
+++ b/container/assistant/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "debian:assistant"
+
 docker build -t debian:assistant .
diff --git a/container/auto-submit/build b/container/auto-submit/build
index 96383e3..48ff111 100755
--- a/container/auto-submit/build
+++ b/container/auto-submit/build
@@ -2,5 +2,9 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "alpine:auto-submit"
+
 docker build -t alpine:auto-submit .
 
diff --git a/container/conserver/build b/container/conserver/build
index 0700c5e..a7e3867 100755
--- a/container/conserver/build
+++ b/container/conserver/build
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "conserver_server"
+
 ./generate_conserver.rb || exit 1
 
 docker build -t conserver_server .
diff --git a/container/crystal-base/build b/container/crystal-base/build
index 4df65a5..642e190 100755
--- a/container/crystal-base/build
+++ b/container/crystal-base/build
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "alpine:crystal-base"
+
 if [ -n "$SQUID_HOST" ] && [ -n "$SQUID_PORT" ]; then
 	proxy="http://$SQUID_HOST:$SQUID_PORT/"
 else
diff --git a/container/crystal-compiler/build b/container/crystal-compiler/build
index cee43eb..570fe98 100755
--- a/container/crystal-compiler/build
+++ b/container/crystal-compiler/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "alpine:crystal-compiler"
+
 docker build -t alpine:crystal-compiler .
diff --git a/container/crystal-shards/build b/container/crystal-shards/build
index 784f571..7c2a712 100755
--- a/container/crystal-shards/build
+++ b/container/crystal-shards/build
@@ -6,6 +6,9 @@
 # If job.yaml does not have these two parameters, git will use the local proxy cache,
 # GITCACHE_HOST defaults to the local ip, GITCACHE_PORT default port is 5000
 . ../defconfig.sh
+
+docker_skip_rebuild "alpine:crystal-shards"
+
 load_cci_defaults
 
 docker build --build-arg GITCACHE_HOST=$GITCACHE_HOST --build-arg GITCACHE_PORT=$GITCACHE_PORT -t alpine:crystal-shards .
diff --git a/container/debian/build b/container/debian/build
index 6bff579..eac9af2 100755
--- a/container/debian/build
+++ b/container/debian/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "debian:testbed"
+
 docker build -t debian:testbed .
diff --git a/container/delimiter/build b/container/delimiter/build
index f7f53e7..606149d 100755
--- a/container/delimiter/build
+++ b/container/delimiter/build
@@ -4,6 +4,8 @@
 
 . ../defconfig.sh
 
+docker_skip_rebuild "delimiter"
+
 load_cci_defaults
 
 docker build -t delimiter .
diff --git a/container/dnsmasq/build b/container/dnsmasq/build
index 8a22575..b5738bc 100755
--- a/container/dnsmasq/build
+++ b/container/dnsmasq/build
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "dnsmasq:alpine"
+
 [[ -e /tftpboot/boot.ipxe ]] || {
     cp tftpboot/boot.ipxe /tftpboot/boot.ipxe
 }
diff --git a/container/dracut-initrd/build b/container/dracut-initrd/build
index 181b896..f02cea9 100755
--- a/container/dracut-initrd/build
+++ b/container/dracut-initrd/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "debian:dracut"
+
 docker build -t debian:dracut .
diff --git a/container/es/build b/container/es/build
index 17a225c..c7d7115 100755
--- a/container/es/build
+++ b/container/es/build
@@ -5,6 +5,8 @@
 
 require_relative '../defconfig.rb'
 
+docker_skip_rebuild "es643b:alpine311"
+
 available_memory = get_available_memory
 
 system "docker build -t es643b:alpine311 --build-arg MEMORY=#{available_memory} --network=host ."
diff --git a/container/extract-stats/build b/container/extract-stats/build
index 1aa9982..c315f0c 100755
--- a/container/extract-stats/build
+++ b/container/extract-stats/build
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "extract-stats"
+
 CCI_SRC=$CCI_SRC
 bash $CCI_SRC/container/compile .
 
diff --git a/container/fetch-mail/build b/container/fetch-mail/build
index e72bed8..9b1a501 100755
--- a/container/fetch-mail/build
+++ b/container/fetch-mail/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "fetch-mail:latest"
+
 docker build -t fetch-mail:latest .
diff --git a/container/fluentd-base/build b/container/fluentd-base/build
index 32e0a38..72b85bf 100755
--- a/container/fluentd-base/build
+++ b/container/fluentd-base/build
@@ -3,4 +3,8 @@
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 # frozen_string_literal: true
 
+require_relative '../defconfig'
+
+docker_skip_rebuild "fluentd-base:alpine"
+
 system 'docker build -t fluentd-base:alpine .'
diff --git a/container/git-daemon/build b/container/git-daemon/build
index d81e4b9..5ba9a52 100755
--- a/container/git-daemon/build
+++ b/container/git-daemon/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "apline311:git-daemon"
+
 docker build -t apline311:git-daemon .
diff --git a/container/git-mirror/build b/container/git-mirror/build
index 66967e4..c302ac7 100755
--- a/container/git-mirror/build
+++ b/container/git-mirror/build
@@ -2,5 +2,9 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "alpine38:git-mirror"
+
 docker build -t alpine38:git-mirror .
 
diff --git a/container/gitcache/build b/container/gitcache/build
index 5135f7c..d7f3523 100755
--- a/container/gitcache/build
+++ b/container/gitcache/build
@@ -3,4 +3,8 @@
 # Copyright (C) 2019-2020  Eric D.little51
 # SPDX-License-Identifier: GPL-3.0
 
+. ../defconfig.sh
+
+docker_skip_rebuild "gitcache"
+
 docker build -t gitcache .
diff --git a/container/initrd-cifs/build b/container/initrd-cifs/build
index 4b93647..19d5125 100755
--- a/container/initrd-cifs/build
+++ b/container/initrd-cifs/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "initrd-cifs"
+
 docker build -t initrd-cifs .
diff --git a/container/initrd-http/build b/container/initrd-http/build
index 1b039dc..22babcd 100755
--- a/container/initrd-http/build
+++ b/container/initrd-http/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "initrd-http"
+
 docker build -t initrd-http .
diff --git a/container/kibana/build b/container/kibana/build
index 52d5a2a..9a1fb6d 100755
--- a/container/kibana/build
+++ b/container/kibana/build
@@ -3,6 +3,10 @@
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 # frozen_string_literal: true
 
+require_relative '../defconfig'
+
+docker_skip_rebuild "kibana:7.6.2"
+
 BASE_IMAGE_DICT = {
   'aarch64' => 'gagara/kibana-oss-arm64:7.6.2',
   'x86_64' => 'kibana:7.6.2' }.freeze
diff --git a/container/lifecycle/build b/container/lifecycle/build
index bfb7490..00a9c84 100755
--- a/container/lifecycle/build
+++ b/container/lifecycle/build
@@ -11,6 +11,8 @@ defaults = relevant_defaults(names)
 
 LIFECYCLE_PORT = defaults['LIFECYCLE_PORT'] || '11312'
 
+docker_skip_rebuild "lifecycle-#{LIFECYCLE_PORT}"
+
 CCI_SRC = ENV['CCI_SRC']
 system "bash #{CCI_SRC}/container/compile ."
 system "docker build -t lifecycle-#{LIFECYCLE_PORT} ."
diff --git a/container/lkp-initrd/build b/container/lkp-initrd/build
index 2383323..cfba617 100755
--- a/container/lkp-initrd/build
+++ b/container/lkp-initrd/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "alpine:lkp"
+
 docker build -t alpine:lkp .
diff --git a/container/logging-es/build b/container/logging-es/build
index 6465ace..3be841a 100755
--- a/container/logging-es/build
+++ b/container/logging-es/build
@@ -5,6 +5,8 @@
 
 require_relative '../defconfig.rb'
 
+docker_skip_rebuild "logging-es:7.6.2"
+
 BASE_IMAGE_DICT = {
   'aarch64' => 'gagara/elasticsearch-oss-arm64:7.6.2',
   'x86_64' => 'elasticsearch:7.6.2'
diff --git a/container/mail-robot/build b/container/mail-robot/build
index c564add..4483e89 100755
--- a/container/mail-robot/build
+++ b/container/mail-robot/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "mail-robot:latest"
+
 docker build -t mail-robot:latest .
diff --git a/container/manjaro/build b/container/manjaro/build
index 114e550..6aeb3c6 100755
--- a/container/manjaro/build
+++ b/container/manjaro/build
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "manjaro:testbed"
+
 declare -A BASE_IMAGE_DICT
 
 BASE_IMAGE_DICT=(
diff --git a/container/master-fluentd/build b/container/master-fluentd/build
index 7d0291d..987cfcd 100755
--- a/container/master-fluentd/build
+++ b/container/master-fluentd/build
@@ -3,4 +3,8 @@
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 # frozen_string_literal: true
 
+require_relative '../defconfig'
+
+docker_skip_rebuild "master-fluentd:alpine"
+
 system 'docker build -t master-fluentd:alpine .'
diff --git a/container/minio/build b/container/minio/build
index d1ccd06..b0909e9 100755
--- a/container/minio/build
+++ b/container/minio/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "jessestuart/minio"
+
 docker pull jessestuart/minio
diff --git a/container/monitoring/build b/container/monitoring/build
index bcb0c37..121ede0 100755
--- a/container/monitoring/build
+++ b/container/monitoring/build
@@ -11,6 +11,8 @@ defaults = relevant_defaults(names)
 
 MONITOR_PORT = (defaults['MONITOR_PORT'] || '11310')
 
+docker_skip_rebuild "monitoring-#{MONITOR_PORT}"
+
 CCI_SRC = ENV['CCI_SRC']
 system "bash #{CCI_SRC}/container/compile ."
 system "docker build -t monitoring-#{MONITOR_PORT} ."
diff --git a/container/netdata-slave/build b/container/netdata-slave/build
index 1a84550..cb53364 100755
--- a/container/netdata-slave/build
+++ b/container/netdata-slave/build
@@ -2,4 +2,8 @@
 # Origin: https://hub.docker.com/r/netdata/netdata
 # SPDX-License-Identifier: GPL-3.0+
 
+. ../defconfig.sh
+
+docker_skip_rebuild "netdata/netdata-slave"
+
 docker build -t netdata/netdata-slave .
diff --git a/container/netdata/build b/container/netdata/build
index 809b445..6aa9a17 100755
--- a/container/netdata/build
+++ b/container/netdata/build
@@ -2,4 +2,8 @@
 # Origin: https://hub.docker.com/r/netdata/netdata
 # SPDX-License-Identifier: GPL-3.0+
 
+. ../defconfig.sh
+
+docker_skip_rebuild "netdata/netdatalkp"
+
 docker build -t netdata/netdatalkp .
diff --git a/container/ntp-server/build b/container/ntp-server/build
index 7826fb2..d52f9dd 100755
--- a/container/ntp-server/build
+++ b/container/ntp-server/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "ntp-server"
+
 docker build -t ntp-server .
diff --git a/container/openresty-proxy-cache/build b/container/openresty-proxy-cache/build
index 507c4fe..7665209 100755
--- a/container/openresty-proxy-cache/build
+++ b/container/openresty-proxy-cache/build
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "openresty:proxy_cache"
+
 [ -d "openresty" ] && rm -rf openresty
 
 git clone https://gitee.com/cuiyili/openresty.git || exit 1
diff --git a/container/os-cifs/build b/container/os-cifs/build
index 77be8e9..de44c44 100755
--- a/container/os-cifs/build
+++ b/container/os-cifs/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "os-cifs"
+
 docker build -t os-cifs .
diff --git a/container/os-http/build b/container/os-http/build
index c1cb008..367748e 100755
--- a/container/os-http/build
+++ b/container/os-http/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "os-http"
+
 docker build -t os-http .
diff --git a/container/os-nfs/build b/container/os-nfs/build
index eea5a7d..e0fd476 100755
--- a/container/os-nfs/build
+++ b/container/os-nfs/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "os-nfs"
+
 docker build -t os-nfs .
diff --git a/container/qcow2rootfs/build b/container/qcow2rootfs/build
index 565de24..7f31bb4 100755
--- a/container/qcow2rootfs/build
+++ b/container/qcow2rootfs/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "qcow2rootfs:auto"
+
 docker build -t qcow2rootfs:auto .
diff --git a/container/qemu-efi/build b/container/qemu-efi/build
index cac9426..4f1d488 100755
--- a/container/qemu-efi/build
+++ b/container/qemu-efi/build
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "debian:qemu-efi"
+
 [ $(arch) == "aarch64" ] && uefi=qemu-efi-aarch64
 [ $(arch) == "x86_64" ] && uefi=ovmf
 
diff --git a/container/rabbitmq/build b/container/rabbitmq/build
index c0bc179..930c112 100755
--- a/container/rabbitmq/build
+++ b/container/rabbitmq/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "rabbitmq:3-management"
+
 docker pull rabbitmq:3-management
diff --git a/container/redis/build b/container/redis/build
index e5230b0..490f99d 100755
--- a/container/redis/build
+++ b/container/redis/build
@@ -2,5 +2,9 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "redis507n:alpine311"
+
 docker build -t redis507n:alpine311 .
 
diff --git a/container/register-accounts/build b/container/register-accounts/build
index e1dcfa4..2364b34 100755
--- a/container/register-accounts/build
+++ b/container/register-accounts/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "register-accounts"
+
 docker build -t register-accounts .
diff --git a/container/registry/build b/container/registry/build
index ca8680a..2edc2c1 100755
--- a/container/registry/build
+++ b/container/registry/build
@@ -2,4 +2,8 @@
 # Origin: https://docs.docker.com/registry
 # SPDX-License-Identifier: Apache license
 
+. ../defconfig.sh
+
+docker_skip_rebuild "registry"
+
 docker pull registry
diff --git a/container/remote-git/build b/container/remote-git/build
index dad1a9b..727c7f9 100755
--- a/container/remote-git/build
+++ b/container/remote-git/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "debian:remote-git"
+
 docker build -t debian:remote-git .
diff --git a/container/result-cifs/build b/container/result-cifs/build
index d97b6dd..fd9d2df 100755
--- a/container/result-cifs/build
+++ b/container/result-cifs/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "result-cifs"
+
 docker build -t result-cifs .
diff --git a/container/result-webdav/build b/container/result-webdav/build
index 7d70ae6..b5be9e9 100755
--- a/container/result-webdav/build
+++ b/container/result-webdav/build
@@ -4,4 +4,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "result-webdav"
+
 docker build -t result-webdav .
diff --git a/container/rsync-server/build b/container/rsync-server/build
index 72bfc47..5d36265 100755
--- a/container/rsync-server/build
+++ b/container/rsync-server/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "rsync_server"
+
 docker build -t rsync_server .
diff --git a/container/scheduler-dev/build b/container/scheduler-dev/build
index 1e4c57e..56d27c0 100755
--- a/container/scheduler-dev/build
+++ b/container/scheduler-dev/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "alpine:scheduler-dev"
+
 docker build -t alpine:scheduler-dev .
diff --git a/container/scheduler/build b/container/scheduler/build
index 367aa4e..412988a 100755
--- a/container/scheduler/build
+++ b/container/scheduler/build
@@ -11,6 +11,8 @@ defaults = relevant_defaults(names)
 
 SCHED_PORT = (defaults['SCHED_PORT'] || '3000')
 
+docker_skip_rebuild "sch-ruby-a:v0.00d-#{SCHED_PORT}"
+
 CCI_SRC = ENV['CCI_SRC']
 system "bash #{CCI_SRC}/container/compile ."
 system "cp #{CCI_SRC}/sbin/create-job-cpio.sh ."
diff --git a/container/send-internet-mail/build b/container/send-internet-mail/build
index 078adaf..07ca143 100755
--- a/container/send-internet-mail/build
+++ b/container/send-internet-mail/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "send-internet-mail:latest"
+
 docker build -t send-internet-mail:latest .
diff --git a/container/send-mail/build b/container/send-mail/build
index 9159641..8ae9788 100755
--- a/container/send-mail/build
+++ b/container/send-mail/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "send-mail:latest"
+
 docker build -t send-mail:latest .
diff --git a/container/shellcheck/build b/container/shellcheck/build
index 854bae6..f295e51 100755
--- a/container/shellcheck/build
+++ b/container/shellcheck/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "shellcheck"
+
 docker build -t shellcheck .
diff --git a/container/srv-http/build b/container/srv-http/build
index 3a500ea..eb0dcbc 100755
--- a/container/srv-http/build
+++ b/container/srv-http/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "srv-http"
+
 docker build -t srv-http .
diff --git a/container/ssh-r/build b/container/ssh-r/build
index 4bec543..2ad1bd3 100755
--- a/container/ssh-r/build
+++ b/container/ssh-r/build
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "ssh-r:0.001"
+
 if [ ! -f "known_auth_keys" ]; then
   echo "-----> ERROR: no testbox rsa public key file 'known_auth_keys' at currrent DIR"
   exit 1
diff --git a/container/sub-fluentd/build b/container/sub-fluentd/build
index 797cd0d..1ec2246 100755
--- a/container/sub-fluentd/build
+++ b/container/sub-fluentd/build
@@ -3,4 +3,8 @@
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 # frozen_string_literal: true
 
+require_relative '../defconfig'
+
+docker_skip_rebuild "sub-fluentd:alpine"
+
 system 'docker build -t sub-fluentd:alpine .'
diff --git a/container/submit/build b/container/submit/build
index fba4281..dff884a 100755
--- a/container/submit/build
+++ b/container/submit/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "submit:latest"
+
 docker build -t submit:latest .
diff --git a/container/taskqueue/build b/container/taskqueue/build
index 3a5d4c9..4f69f85 100755
--- a/container/taskqueue/build
+++ b/container/taskqueue/build
@@ -10,6 +10,8 @@ load_cci_defaults
 
 service_port=${TASKQUEUE_PORT:-3060}
 
+docker_skip_rebuild "taskqueue-alpine:v0.001-${service_port}"
+
 if [[ ! -f "taskqueue" ]]; then
   $CCI_SRC/container/compile .
 else
diff --git a/container/upload-libvirt-xml/build b/container/upload-libvirt-xml/build
index d39838b..0a22173 100755
--- a/container/upload-libvirt-xml/build
+++ b/container/upload-libvirt-xml/build
@@ -4,6 +4,10 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "upload-libvirt-xml"
+
 # The libvirt xml upload has nothing to do with the job. It renames the uploaded file and does not currently have permission to upload.
 # it is a transitional service. Two different functions use the same port service,
 
diff --git a/container/web-backend-nginx/build b/container/web-backend-nginx/build
index 4c9d3fe..d282570 100755
--- a/container/web-backend-nginx/build
+++ b/container/web-backend-nginx/build
@@ -2,4 +2,8 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "web-backend-nginx"
+
 docker build -t web-backend-nginx .
diff --git a/container/web-backend/build b/container/web-backend/build
index 671fc97..c7f7d8a 100755
--- a/container/web-backend/build
+++ b/container/web-backend/build
@@ -1,4 +1,8 @@
 #!/bin/sh
 # SPDX-License-Identifier: MulanPSL-2.0+
 
+. ../defconfig.sh
+
+docker_skip_rebuild "debian:web-backend"
+
 docker build -t debian:web-backend .
diff --git a/container/webhook/build b/container/webhook/build
index bb5c0a7..a3475c4 100755
--- a/container/webhook/build
+++ b/container/webhook/build
@@ -2,5 +2,9 @@
 # SPDX-License-Identifier: MulanPSL-2.0+
 # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
 
+. ../defconfig.sh
+
+docker_skip_rebuild "node:webhook"
+
 docker build -t node:webhook .
 
-- 
2.23.0

    

Liu Yinsi

tags

participants (1)