fix: update doublestar lib (goharbor#20442)

* fix: update doublestar lib Signed-off-by: Shengwen Yu <yshengwen@vmware.com> * fix: update api_common_install.sh Signed-off-by: Shengwen Yu <yshengwen@vmware.com> --------- Signed-off-by: Shengwen Yu <yshengwen@vmware.com>
stonezdj · May 20, 2024 · 6c984d8 · 6c984d8
1 parent 1a741cb
commit 6c984d8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/src/go.mod b/src/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/aws/aws-sdk-go v1.34.28
 	github.com/beego/beego/v2 v2.0.6
 	github.com/beego/i18n v0.0.0-20140604031826-e87155e8f0c0
-	github.com/bmatcuk/doublestar v1.1.1
+	github.com/bmatcuk/doublestar v1.3.4
 	github.com/casbin/casbin v1.9.1
 	github.com/cenkalti/backoff/v4 v4.2.1
 	github.com/cloudevents/sdk-go/v2 v2.13.0

diff --git a/src/go.sum b/src/go.sum
@@ -95,8 +95,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
-github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ=
-github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
+github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
+github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
 github.com/casbin/casbin v1.9.1 h1:ucjbS5zTrmSLtH4XogqOG920Poe6QatdXtz1FEbApeM=
 github.com/casbin/casbin v1.9.1/go.mod h1:z8uPsfBJGUsnkagrt3G8QvjgTKFMBJ32UP8HpZllfog=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=

diff --git a/tests/ci/api_common_install.sh b/tests/ci/api_common_install.sh
@@ -24,24 +24,24 @@ python --version
 # in container. So the current work round is read DNS server
 # from system and set the value in /etc/docker/daemon.json.
 
-ip addr
-docker_config_file="/etc/docker/daemon.json"
-dns_ip_string=$(netplan ip leases eth0 | grep -i dns | awk -F = '{print $2}' | tr " " "\n" | sed 's/,/","/g')
-dns=[\"${dns_ip_string}\"]
-echo dns=${dns}
-
-cat $docker_config_file
-if [ -f $docker_config_file ];then
-    if [ $(cat /etc/docker/daemon.json |grep \"dns\" |wc -l) -eq 0 ];then
-        sudo sed "s/}/,\n   \"dns\": $dns\n}/" -i $docker_config_file
-    fi
-else
-    echo "{\"dns\": $dns}" > $docker_config_file
-fi
-cat $docker_config_file
-sudo systemctl stop docker
-sudo systemctl start docker
-sleep 2
+# ip addr
+# docker_config_file="/etc/docker/daemon.json"
+# dns_ip_string=$(netplan ip leases eth0 | grep -i dns | awk -F = '{print $2}' | tr " " "\n" | sed 's/,/","/g')
+# dns=[\"${dns_ip_string}\"]
+# echo dns=${dns}
+# 
+# cat $docker_config_file
+# if [ -f $docker_config_file ];then
+#     if [ $(cat /etc/docker/daemon.json |grep \"dns\" |wc -l) -eq 0 ];then
+#         sudo sed "s/}/,\n   \"dns\": $dns\n}/" -i $docker_config_file
+#     fi
+# else
+#     echo "{\"dns\": $dns}" > $docker_config_file
+# fi
+# cat $docker_config_file
+# sudo systemctl stop docker
+# sudo systemctl start docker
+# sleep 2
 #------------------------------------------------------------#
 
 sudo ./tests/hostcfg.sh