diff --git a/Dockerfile b/Dockerfile index 16190df5..8f6f9bd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM golang:1.21-alpine3.18 AS infra +FROM golang:1.22-alpine3.20 AS infra ARG ARCH=amd64 RUN apk -U add bash coreutils git gcc musl-dev vim less curl wget ca-certificates @@ -43,4 +43,4 @@ RUN --mount=type=cache,id=gomod,target=/go/pkg/mod \ FROM scratch as binary ENV SRC_DIR=/go/src/github.com/k3s-io/kine -COPY --from=build ${SRC_DIR}/bin /bin \ No newline at end of file +COPY --from=build ${SRC_DIR}/bin /bin diff --git a/Dockerfile.test b/Dockerfile.test index d14d0cdf..c3e1e1c3 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,15 +1,15 @@ -FROM golang:1.21-alpine3.17 +FROM golang:1.22-alpine3.20 ARG ARCH=amd64 -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 +RUN apk -U add bash coreutils git gcc musl-dev vim less curl wget ca-certificates +RUN apk -U add docker-cli file findutils py3-pip && \ + pip install --break-system-packages kubernetes termplotlib==v0.3.4 ENV KINE_SOURCE /go/src/github.com/k3s-io/kine/ ENV HOME ${KINE_SOURCE} WORKDIR ${KINE_SOURCE} - COPY . ${KINE_SOURCE} ENTRYPOINT ["/bin/bash", "-c"]