From aeae3f76c302fc6745a76f0c364f668daa124633 Mon Sep 17 00:00:00 2001 From: Nicolas Duchon Date: Thu, 21 Dec 2023 02:09:26 +0100 Subject: [PATCH] build: revert "bump golang from 1.20.12 to 1.21.5" This reverts commit 2bd8114a107a7fe09cc32edd50d13873ce203b24. --- .github/workflows/assets.yml | 2 +- .github/workflows/tests.yml | 2 +- Dockerfile.alpine | 2 +- Dockerfile.debian | 2 +- go.mod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml index 79746fcb..7359162f 100644 --- a/.github/workflows/assets.yml +++ b/.github/workflows/assets.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.20" - name: Build release assets run: make release diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dbeb7175..dcd9fae2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.21" + go-version: "1.20" - name: Install dependencies run: make get-deps diff --git a/Dockerfile.alpine b/Dockerfile.alpine index e28245d7..1f9abfc2 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,7 +1,7 @@ ARG DOCKER_GEN_VERSION=main # Build docker-gen from scratch -FROM golang:1.21.5-alpine as go-builder +FROM golang:1.20.12-alpine as go-builder ARG DOCKER_GEN_VERSION WORKDIR /build diff --git a/Dockerfile.debian b/Dockerfile.debian index 3c72b679..5864af61 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -1,7 +1,7 @@ ARG DOCKER_GEN_VERSION=main # Build docker-gen from scratch -FROM golang:1.21.5 as go-builder +FROM golang:1.20.12 as go-builder ARG DOCKER_GEN_VERSION diff --git a/go.mod b/go.mod index 920c157e..105e2a68 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/nginx-proxy/docker-gen -go 1.21 +go 1.20 require ( github.com/BurntSushi/toml v1.3.2