Skip to content

Commit

Permalink
Update Golang to 1.15.12 (#25629)
Browse files Browse the repository at this point in the history
(cherry picked from commit fd13dc5)

# Conflicts:
#	libbeat/docs/version.asciidoc
  • Loading branch information
kvch authored and mergify-bot committed May 10, 2021
1 parent 035664e commit 8bb8542
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.15.9
1.15.12
1 change: 1 addition & 0 deletions CHANGELOG-developer.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
- Update Go version to 1.15.8. {pull}23955[23955]
- Update Go version to 1.15.9. {pull}24442[24442]
- Update Go version to 1.15.10. {pull}24606[24606]
- Update Go version to 1.15.12. {pull}25629[25629]
2 changes: 1 addition & 1 deletion auditbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.10
FROM golang:1.15.12

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion filebeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.10
FROM golang:1.15.12

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.10
FROM golang:1.15.12

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion journalbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.10
FROM golang:1.15.12

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.10
FROM golang:1.15.12

RUN \
apt-get update \
Expand Down
6 changes: 6 additions & 0 deletions libbeat/docs/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<<<<<<< HEAD
:stack-version: 7.13.0
:doc-branch: 7.x
:go-version: 1.15.10
=======
:stack-version: 8.0.0
:doc-branch: master
:go-version: 1.15.12
>>>>>>> fd13dc5e0d... Update Golang to 1.15.12 (#25629)
:release-state: unreleased
:python: 3.7
:docker: 1.12
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.10
FROM golang:1.15.12

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/http/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.10
FROM golang:1.15.12

COPY test/main.go main.go

Expand Down
2 changes: 1 addition & 1 deletion packetbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.10
FROM golang:1.15.12

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion x-pack/functionbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.10
FROM golang:1.15.12

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion x-pack/libbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.10
FROM golang:1.15.12

RUN \
apt-get update \
Expand Down

0 comments on commit 8bb8542

Please sign in to comment.