From c49f165711843872a98f4bd4139bc384b314b662 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 17:05:19 +0000 Subject: [PATCH 1/2] chore(deps): update docker dependencies --- Dockerfile.dapper | 2 +- package/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 7e94b85d..26a1c3cd 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -FROM registry.suse.com/bci/golang:1.22 +FROM registry.suse.com/bci/golang:1.23 ARG DAPPER_HOST_ARCH ENV ARCH=${DAPPER_HOST_ARCH} diff --git a/package/Dockerfile b/package/Dockerfile index d80ac8e0..d2a0c98a 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -1,6 +1,6 @@ -# syntax=docker/dockerfile:1.9.0 +# syntax=docker/dockerfile:1.10.0 -FROM registry.suse.com/bci/golang:1.22 AS builder +FROM registry.suse.com/bci/golang:1.23 AS builder ARG ARCH=amd64 From 06cd518968fac0041ebda7e4d24d16116ea16505 Mon Sep 17 00:00:00 2001 From: Derek Su Date: Sun, 13 Oct 2024 03:13:20 +0000 Subject: [PATCH 2/2] chore(dockerfile): update golangci-lint to v1.60.3 Signed-off-by: Derek Su --- Dockerfile.dapper | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 26a1c3cd..6ae79b55 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -9,7 +9,7 @@ ENV DAPPER_SOURCE /cli ENV DAPPER_OUTPUT ./bin ./docs coverage.out ENV DAPPER_DOCKER_SOCKET true -ENV GOLANGCI_LINT_VERSION="v1.55.2" +ENV GOLANGCI_LINT_VERSION="v1.60.3" WORKDIR ${DAPPER_SOURCE} ENTRYPOINT ["./dapper/entry"] @@ -20,6 +20,7 @@ RUN zypper -n install curl awk docker && \ RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION} + # Docker Buildx: The docker version in dapper is too old to have buildx. Install it manually. RUN curl -sSfLO https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-${ARCH} && \ chmod +x buildx-v0.13.1.linux-${ARCH} && \