Merge pull request #1600 from ktock/fix-k3s-ci-host

CI: Fix k3s test faliure
containerd · Mar 15, 2024 · 7d8da24 · 7d8da24
2 parents 6e5d5a0 + cabb527
commit 7d8da24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/script/k3s/run-k3s.sh b/script/k3s/run-k3s.sh
@@ -79,6 +79,11 @@ sed -i -E 's|DAPPER_ENV="([^"]*)"|DAPPER_ENV="\1 DOCKER_BUILDKIT"|g' "${TMP_K3S_
         REPO="${K3S_NODE_REPO}" IMAGE_NAME="${K3S_NODE_IMAGE_NAME}" TAG="${K3S_NODE_TAG}" SKIP_VALIDATE=1 make
 )
 cat <<EOF > "${TMP_BUILTIN_CONF}"
+mirrors:
+  ${REGISTRY_HOST}:5000:
+    endpoint:
+      - ${REGISTRY_HOST}:5000
+      - ${REGISTRY_HOST}:5001 # dummy
 configs:
   ${REGISTRY_HOST}:5000:
     tls:

diff --git a/script/optimize/optimize/entrypoint.sh b/script/optimize/optimize/entrypoint.sh
@@ -128,8 +128,7 @@ function check_uncompressed_size {
 function check_optimization {
     local TARGET=${1}
 
-    LOCAL_WORKING_DIR="${WORKING_DIR}/$(date '+%H%M%S')"
-    mkdir "${LOCAL_WORKING_DIR}"
+    LOCAL_WORKING_DIR="$(mktemp -d --tmpdir=${WORKING_DIR}/)"
     nerdctl pull "${TARGET}" && nerdctl save "${TARGET}" | tar xv -C "${LOCAL_WORKING_DIR}"
     LAYERS="$(cat "${LOCAL_WORKING_DIR}/manifest.json" | jq -r '.[0].Layers[]')"