Skip to content

Use go1.10.1 and go1.9.5 #39

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

Merged
merged 1 commit into from
Mar 31, 2018
Merged

Use go1.10.1 and go1.9.5 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 1.10/Makefile.COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ REPOSITORY := quay.io/prometheus
NAME := golang-builder
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
SUFFIX ?= -$(subst /,-,$(BRANCH))
VERSION := 1.10.0
VERSION := 1.10.1
DIRNAME := $(shell basename $(CURDIR))
PARENTDIRNAME := $(shell basename $(shell dirname $(CURDIR)))

Expand Down
4 changes: 2 additions & 2 deletions 1.10/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ RUN \
make \
&& rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION 1.10
ENV GOLANG_VERSION 1.10.1
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33
ENV GOLANG_DOWNLOAD_SHA256 72d820dec546752e5a8303b33b009079c15c2390ce76d67cf514991646c6127b

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 1.9/Makefile.COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ REPOSITORY := quay.io/prometheus
NAME := golang-builder
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
SUFFIX ?= -$(subst /,-,$(BRANCH))
VERSION := 1.9.4
VERSION := 1.9.5
DIRNAME := $(shell basename $(CURDIR))
PARENTDIRNAME := $(shell basename $(shell dirname $(CURDIR)))

Expand Down
4 changes: 2 additions & 2 deletions 1.9/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ RUN \
make \
&& rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION 1.9.4
ENV GOLANG_VERSION 1.9.5
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 15b0937615809f87321a457bb1265f946f9f6e736c563d6c5e0bd2c22e44f779
ENV GOLANG_DOWNLOAD_SHA256 d21bdabf4272c2248c41b45cec606844bdc5c7c04240899bde36c01a28c51ee7

RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

Docker Builder Image for cross-building Golang Prometheus projects.

- `latest`, `main`, `1.10-main`, `1.10.0-main` ([1.10/main/Dockerfile](1.10/main/Dockerfile))
- `arm`, `1.10-arm`, `1.10.0-arm` ([1.10/arm/Dockerfile](1.10/arm/Dockerfile))
- `powerpc`, `1.10-powerpc`, `1.10.0-powerpc` ([1.10/powerpc/Dockerfile](1.10/powerpc/Dockerfile))
- `mips`, `1.10-mips`, `1.10.0-mips` ([1.10/mips/Dockerfile](1.10/mips/Dockerfile))
- `1.9-main`, `1.9.4-main` ([1.9/main/Dockerfile](1.9/main/Dockerfile))
- `1.9-arm`, `1.9.4-arm` ([1.9/arm/Dockerfile](1.9/arm/Dockerfile))
- `1.9-powerpc`, `1.9.4-powerpc` ([1.9/powerpc/Dockerfile](1.9/powerpc/Dockerfile))
- `1.9-mips`, `1.9.4-mips` ([1.9/mips/Dockerfile](1.9/mips/Dockerfile))
- `latest`, `main`, `1.10-main`, `1.10.1-main` ([1.10/main/Dockerfile](1.10/main/Dockerfile))
- `arm`, `1.10-arm`, `1.10.1-arm` ([1.10/arm/Dockerfile](1.10/arm/Dockerfile))
- `powerpc`, `1.10-powerpc`, `1.10.1-powerpc` ([1.10/powerpc/Dockerfile](1.10/powerpc/Dockerfile))
- `mips`, `1.10-mips`, `1.10.1-mips` ([1.10/mips/Dockerfile](1.10/mips/Dockerfile))
- `1.9-main`, `1.9.5-main` ([1.9/main/Dockerfile](1.9/main/Dockerfile))
- `1.9-arm`, `1.9.5-arm` ([1.9/arm/Dockerfile](1.9/arm/Dockerfile))
- `1.9-powerpc`, `1.9.5-powerpc` ([1.9/powerpc/Dockerfile](1.9/powerpc/Dockerfile))
- `1.9-mips`, `1.9.5-mips` ([1.9/mips/Dockerfile](1.9/mips/Dockerfile))

## Usage

Expand Down