Skip to content

Commit d0d06d4

Browse files
authored
Merge pull request docker#9708 from milas/golang-1.18.5
build: bump to Go 1.18.5
2 parents 9e48afb + b1e4cde commit d0d06d4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
required: false
1313
default: "false"
1414
env:
15-
GO_VERSION: 1.18.4
15+
GO_VERSION: 1.18.5
1616
jobs:
1717
lint:
1818
name: Lint

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
description: "Release Tag"
88
required: true
99
env:
10-
GO_VERSION: 1.18.4
10+
GO_VERSION: 1.18.5
1111
jobs:
1212
upload-release:
1313
runs-on: ubuntu-latest
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Setup docker CLI
2525
run: |
26-
curl https://download.docker.com/linux/static/stable/x86_64/docker-20.10.3.tgz | tar xz
26+
curl https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz | tar xz
2727
sudo cp ./docker/docker /usr/bin/ && rm -rf docker && docker version
2828
2929
- name: Build

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717

18-
ARG GO_VERSION=1.18.4-alpine
19-
ARG GOLANGCI_LINT_VERSION=v1.46.2-alpine
18+
ARG GO_VERSION=1.18.5-alpine
19+
ARG GOLANGCI_LINT_VERSION=v1.47.3-alpine
2020
ARG PROTOC_GEN_GO_VERSION=v1.4.3
2121

2222
FROM --platform=${BUILDPLATFORM} golangci/golangci-lint:${GOLANGCI_LINT_VERSION} AS local-golangci-lint

docs/docs.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717

18-
ARG GO_VERSION=1.18.4
18+
ARG GO_VERSION=1.18.5
1919
ARG FORMATS=md,yaml
2020

2121
FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION}-alpine AS docsgen

0 commit comments

Comments
 (0)