Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/update golang 1.10.7 and 1.11.4 #11

Merged
merged 2 commits into from
Dec 18, 2018
Merged

Fix/update golang 1.10.7 and 1.11.4 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24d84a0
Update go to 1.11.4 and 1.10.7
ph Dec 18, 2018
aafa305
update sha256
ph Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ The base image used is Debian 9 (stretch) unless otherwise specified.

## Build Tags

- `1.10.6-main`, `1.11.3-main` - linux/{amd64,386} and windows/{amd64,386}
- `1.10.6-arm`, `1.11.3-arm` - linux/{armv5,armv6,armv7,arm64}
- `1.10.6-darwin`, `1.11.3-darwin` - darwin/{amd64,386}
- `1.10.6-ppc`, `1.11.3-ppc` - linux/{ppc64,ppc64le}
- `1.10.6-mips`, `1.11.3-mips` - linux/{mips,mipsle,mips64,mips64le}
- `1.10.6-s390x`, `1.11.3-s390x` - linux/s390x
- `1.10.6-main-debian7`, `1.11.3-main-debian7` - linux/{amd64,386} and windows/{amd64,386} (Debian 7
- `1.10.7-main`, `1.11.4-main` - linux/{amd64,386} and windows/{amd64,386}
- `1.10.7-arm`, `1.11.4-arm` - linux/{armv5,armv6,armv7,arm64}
- `1.10.7-darwin`, `1.11.4-darwin` - darwin/{amd64,386}
- `1.10.7-ppc`, `1.11.4-ppc` - linux/{ppc64,ppc64le}
- `1.10.7-mips`, `1.11.4-mips` - linux/{mips,mipsle,mips64,mips64le}
- `1.10.7-s390x`, `1.11.4-s390x` - linux/s390x
- `1.10.7-main-debian7`, `1.11.4-main-debian7` - linux/{amd64,386} and windows/{amd64,386} (Debian 7
uses glibc 2.13 so the resulting binaries (if dynamically linked) have greater
compatibility.)
- `1.10.6-main-debian8`, `1.11.3-main-debian8` - linux/{amd64,386} and windows/{amd64,386} (Debian 8
- `1.10.7-main-debian8`, `1.11.4-main-debian8` - linux/{amd64,386} and windows/{amd64,386} (Debian 8
uses glibc 2.19)

## Usage Example
Expand All @@ -31,7 +31,7 @@ docker run -it --rm \
-v $GOPATH/src/github.com/user/go-project:/go/src/github.com/user/go-project \
-w /go/src/github.com/user/go-project \
-e CGO_ENABLED=1 \
docker.elastic.co/beats-dev/golang-crossbuild:1.10.6-arm \
docker.elastic.co/beats-dev/golang-crossbuild:1.10.7-arm \
--build-cmd "make build" \
-p "linux/armv7"
```
Expand Down
2 changes: 1 addition & 1 deletion go1.10/Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
include $(SELF_DIR)/../Makefile.common

NAME := golang-crossbuild
VERSION := 1.10.6
VERSION := 1.10.7
DEBIAN_VERSION ?= 9
SUFFIX := -$(shell basename $(CURDIR))
TAG_EXTENSION ?=
Expand Down
4 changes: 2 additions & 2 deletions go1.10/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ RUN \
bison \
&& rm -rf /var/lib/apt/lists/*

ARG GOLANG_VERSION=1.10.6
ARG GOLANG_VERSION=1.10.7
ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
ARG GOLANG_DOWNLOAD_SHA256=acbdedf28b55b38d2db6f06209a25a869a36d31bdcf09fd2ec3d40e1279e0592
ARG GOLANG_DOWNLOAD_SHA256=1aabe10919048822f3bb1865f7a22f8b78387a12c03cd573101594bc8fb33579

RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
Expand Down
2 changes: 1 addition & 1 deletion go1.11/Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
include $(SELF_DIR)/../Makefile.common

NAME := golang-crossbuild
VERSION := 1.11.3
VERSION := 1.11.4
DEBIAN_VERSION ?= 9
SUFFIX := -$(shell basename $(CURDIR))
TAG_EXTENSION ?=
Expand Down
4 changes: 2 additions & 2 deletions go1.11/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ RUN \
bison \
&& rm -rf /var/lib/apt/lists/*

ARG GOLANG_VERSION=1.11.3
ARG GOLANG_VERSION=1.11.4
ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
ARG GOLANG_DOWNLOAD_SHA256=d20a4869ffb13cee0f7ee777bf18c7b9b67ef0375f93fac1298519e0c227a07f
ARG GOLANG_DOWNLOAD_SHA256=fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b

RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
Expand Down