diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 216981d9..c735df1e 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine3.16 AS dapper +FROM golang:1.20-alpine3.17 AS dapper ARG ARCH=amd64 diff --git a/Dockerfile.test.dapper b/Dockerfile.test.dapper index da69b475..56fa4811 100644 --- a/Dockerfile.test.dapper +++ b/Dockerfile.test.dapper @@ -1,8 +1,8 @@ -FROM golang:1.19-alpine3.16 AS dapper +FROM golang:1.20-alpine3.17 AS dapper ARG ARCH=amd64 -RUN apk -U add bash coreutils git gcc musl-dev docker-cli vim less file curl wget ca-certificates +RUN apk -U add bash ca-certificates coreutils curl docker-cli file findutils gcc git less musl-dev vim wget RUN apk -U add py3-pip && pip install kubernetes termplotlib==v0.3.4 ENV DAPPER_RUN_ARGS --privileged -v kine-cache:/go/src/github.com/k3s-io/kine/.cache diff --git a/scripts/test-helpers b/scripts/test-helpers index 9e5a482c..7e291784 100755 --- a/scripts/test-helpers +++ b/scripts/test-helpers @@ -114,13 +114,12 @@ export -f run-test # --- -inc-count() {( - shopt -s extglob - local count=$(exec 2>/dev/null; ls -1d $TEST_DIR/$1/+([0-9]) | xargs -n1 basename | sort -n -r | head -1) +inc-count() { + local count=$(find $TEST_DIR -mindepth 2 -maxdepth 2 -type d -regex ".*/$1/[0-9]+" -printf '%f\n' | sort -nr | head -1) count=$((count+1)) mkdir -p $TEST_DIR/$1/$count/metadata echo $count -)} +} export -f inc-count # ---