forked from elastic/beats
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update to Golang 1.9.4 (elastic#6326)
* Update to Golang 1.9.4 Keep up with the latest version of Golang. Version prior to 1.9.4 are affected by security issues on build. `go get` could have been used to do unwanted code execution[1] CVE-2018-6574 during build. The changes in golang now enforce more restrictive pragma declaration when linking and compiling. This commits, disable crosscompiling under solaris which requires an update on the standard library. ``` ../vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go:13:3: //go:cgo_import_dynamic libc_pipe pipe "libc.so" only allowed in cgo-generated code ../vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go:14:3: //go:cgo_import_dynamic libc_getsockname getsockname "libsocket.so" only allowed in cgo-generated code ``` We also update popsutil, thag was incorrectly defining an ldflags in a previous release making the build fails under the new restriction. [1] golang/go#23672 * update vendor correctly
- Loading branch information
Showing
46 changed files
with
773 additions
and
357 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
1.9.2 | ||
1.9.4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
dev-tools/packer/docker/xgo-image-deb6/beats-builder/Dockerfile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM tudorg/xgo-deb6-1.9.2 | ||
FROM tudorg/xgo-deb6-1.9.4 | ||
|
||
MAINTAINER Tudor Golubenco <[email protected]> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
#!/bin/sh | ||
|
||
docker build --rm=true -t tudorg/xgo-deb6-base base/ && \ | ||
docker build --rm=true -t tudorg/xgo-deb6-1.9.2 go-1.9.2/ && | ||
docker build --rm=true -t tudorg/xgo-deb6-1.9.4 go-1.9.4/ && | ||
docker build --rm=true -t tudorg/beats-builder-deb6 beats-builder |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# Go cross compiler (xgo): Go 1.9.2 layer | ||
# Go cross compiler (xgo): Go 1.9.4 layer | ||
# Copyright (c) 2014 Péter Szilágyi. All rights reserved. | ||
# | ||
# Released under the MIT license. | ||
|
@@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco <[email protected]> | |
|
||
# Configure the root Go distribution and bootstrap based on it | ||
RUN \ | ||
export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz" && \ | ||
export ROOT_DIST_SHA1="94c889e039e3d2e94ed95e8f8cb747c5bc1c2b58" && \ | ||
export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.4.linux-amd64.tar.gz" && \ | ||
export ROOT_DIST_SHA1="15b0937615809f87321a457bb1265f946f9f6e736c563d6c5e0bd2c22e44f779" && \ | ||
\ | ||
$BOOTSTRAP_PURE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM tudorg/xgo-1.9.2 | ||
FROM tudorg/xgo-1.9.4 | ||
|
||
MAINTAINER Tudor Golubenco <[email protected]> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
#!/bin/sh | ||
|
||
docker build --rm=true -t tudorg/xgo-base base/ && \ | ||
docker build --rm=true -t tudorg/xgo-1.9.2 go-1.9.2/ && | ||
docker build --rm=true -t tudorg/xgo-1.9.4 go-1.9.4/ && | ||
docker build --rm=true -t tudorg/beats-builder beats-builder |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# Go cross compiler (xgo): Go 1.9.2 layer | ||
# Go cross compiler (xgo): Go 1.9.4 layer | ||
# Copyright (c) 2014 Péter Szilágyi. All rights reserved. | ||
# | ||
# Released under the MIT license. | ||
|
@@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco <[email protected]> | |
|
||
# Configure the root Go distribution and bootstrap based on it | ||
RUN \ | ||
export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz" && \ | ||
export ROOT_DIST_SHA1="94c889e039e3d2e94ed95e8f8cb747c5bc1c2b58" && \ | ||
export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.4.linux-amd64.tar.gz" && \ | ||
export ROOT_DIST_SHA1="15b0937615809f87321a457bb1265f946f9f6e736c563d6c5e0bd2c22e44f779" && \ | ||
\ | ||
$BOOTSTRAP_PURE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM golang:1.9.2 | ||
FROM golang:1.9.4 | ||
MAINTAINER Nicolas Ruflin <[email protected]> | ||
|
||
RUN set -x && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ services: | |
language: go | ||
|
||
go: | ||
- 1.9.2 | ||
- 1.9.4 | ||
|
||
os: | ||
- linux | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# Beats dockerfile used for testing | ||
FROM golang:1.9.2 | ||
FROM golang:1.9.4 | ||
MAINTAINER Nicolas Ruflin <[email protected]> | ||
|
||
RUN set -x && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM golang:1.9.2 | ||
FROM golang:1.9.4 | ||
MAINTAINER Nicolas Ruflin <[email protected]> | ||
|
||
RUN set -x && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM golang:1.9.2 | ||
FROM golang:1.9.4 | ||
|
||
COPY test/main.go main.go | ||
|
||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.