Skip to content

Bump Go version #76

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
Sep 10, 2019
Merged

Bump Go version #76

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.11/Makefile.COMMON → 1.13/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.11.13
VERSION := 1.13.0
DIRNAME := $(shell basename $(CURDIR))
PARENTDIRNAME := $(shell basename $(shell dirname $(CURDIR)))

Expand Down
0 1.11/arm/.dockerignore → 1.13/arm/.dockerignore
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 1.11/arm/Dockerfile → 1.13/arm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/prometheus/golang-builder:1.11-base
FROM quay.io/prometheus/golang-builder:1.13-base
MAINTAINER The Prometheus Authors <[email protected]>

RUN \
Expand Down
0 1.11/arm/Makefile → 1.13/arm/Makefile
View file
Open in desktop
File renamed without changes.
0 1.11/arm/rootfs/builder.sh → 1.13/arm/rootfs/builder.sh
View file
Open in desktop
File renamed without changes.
0 1.11/base/.dockerignore → 1.13/base/.dockerignore
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions 1.11/base/Dockerfile → 1.13/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ RUN \
make \
&& rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION 1.11.13
ENV GOLANG_VERSION 1.13
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 50fe8e13592f8cf22304b9c4adfc11849a2c3d281b1d7e09c924ae24874c6daa
ENV GOLANG_DOWNLOAD_SHA256 68a2297eb099d1a76097905a2ce334e3155004ec08cdea85f24527be3c48e856

RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
Expand Down
0 1.11/base/Makefile → 1.13/base/Makefile
View file
Open in desktop
File renamed without changes.
0 1.11/base/rootfs/builder.sh → 1.13/base/rootfs/builder.sh
View file
Open in desktop
File renamed without changes.
0 1.11/base/rootfs/common.sh → 1.13/base/rootfs/common.sh
View file
Open in desktop
File renamed without changes.
0 1.11/main/.dockerignore → 1.13/main/.dockerignore
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 1.11/main/Dockerfile → 1.13/main/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/prometheus/golang-builder:1.11-base
FROM quay.io/prometheus/golang-builder:1.13-base
MAINTAINER The Prometheus Authors <[email protected]>

RUN \
Expand Down
0 1.11/main/Makefile → 1.13/main/Makefile
View file
Open in desktop
File renamed without changes.
0 1.11/main/rootfs/builder.sh → 1.13/main/rootfs/builder.sh
View file
Open in desktop
File renamed without changes.
0 1.11/mips/.dockerignore → 1.13/mips/.dockerignore
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 1.11/mips/Dockerfile → 1.13/mips/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/prometheus/golang-builder:1.11-base
FROM quay.io/prometheus/golang-builder:1.13-base
MAINTAINER The Prometheus Authors <[email protected]>

RUN \
Expand Down
0 1.11/mips/Makefile → 1.13/mips/Makefile
View file
Open in desktop
File renamed without changes.
0 1.11/mips/rootfs/builder.sh → 1.13/mips/rootfs/builder.sh
View file
Open in desktop
File renamed without changes.
0 1.11/powerpc/.dockerignore → 1.13/powerpc/.dockerignore
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 1.11/powerpc/Dockerfile → 1.13/powerpc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/prometheus/golang-builder:1.11-base
FROM quay.io/prometheus/golang-builder:1.13-base
MAINTAINER The Prometheus Authors <[email protected]>

RUN \
Expand Down
0 1.11/powerpc/Makefile → 1.13/powerpc/Makefile
View file
Open in desktop
File renamed without changes.
0 1.11/powerpc/rootfs/builder.sh → 1.13/powerpc/rootfs/builder.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 1.11/s390x/Dockerfile → 1.13/s390x/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/prometheus/golang-builder:1.11-base
FROM quay.io/prometheus/golang-builder:1.13-base
MAINTAINER The Prometheus Authors <[email protected]>

RUN \
Expand Down
0 1.11/s390x/Makefile → 1.13/s390x/Makefile
View file
Open in desktop
File renamed without changes.
0 1.11/s390x/rootfs/builder.sh → 1.13/s390x/rootfs/builder.sh
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
REPOSITORY := quay.io/prometheus
NAME := golang-builder
VARIANTS ?= base main arm powerpc mips s390x
LATEST ?= 1.12
VERSIONS ?= 1.11 1.12
LATEST ?= 1.13
VERSIONS ?= 1.12 1.13

all: build

Expand Down
20 changes: 10 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@

Docker Builder Image for cross-building Golang Prometheus projects.

- `latest`, `main`, `1.12-main`, `1.12.9-main` ([1.12/main/Dockerfile](1.12/main/Dockerfile))
- `arm`, `1.12-arm`, `1.12.9-arm` ([1.12/arm/Dockerfile](1.12/arm/Dockerfile))
- `powerpc`, `1.12-powerpc`, `1.12.9-powerpc` ([1.12/powerpc/Dockerfile](1.12/powerpc/Dockerfile))
- `mips`, `1.12-mips`, `1.12.9-mips` ([1.12/mips/Dockerfile](1.12/mips/Dockerfile))
- `s390x`, `1.12-s390x`, `1.12.9-s390x` ([1.12/s390x/Dockerfile](1.12/s390x/Dockerfile))
- `1.11-main`, `1.11.13-main` ([1.11/main/Dockerfile](1.11/main/Dockerfile))
- `arm`, `1.11-arm`, `1.11.13-arm` ([1.11/arm/Dockerfile](1.11/arm/Dockerfile))
- `powerpc`, `1.11-powerpc`, `1.11.13-powerpc` ([1.11/powerpc/Dockerfile](1.11/powerpc/Dockerfile))
- `mips`, `1.11-mips`, `1.11.13-mips` ([1.11/mips/Dockerfile](1.11/mips/Dockerfile))
- `s390x`, `1.11-s390x`, `1.11.13-s390x` ([1.11/s390x/Dockerfile](1.11/s390x/Dockerfile))
- `latest`, `main`, `1.13-main`, `1.13.0-main` ([1.13/main/Dockerfile](1.13/main/Dockerfile))
- `arm`, `1.13-arm`, `1.13.0-arm` ([1.13/arm/Dockerfile](1.13/arm/Dockerfile))
- `powerpc`, `1.13-powerpc`, `1.13.0-powerpc` ([1.13/powerpc/Dockerfile](1.13/powerpc/Dockerfile))
- `mips`, `1.13-mips`, `1.13.0-mips` ([1.13/mips/Dockerfile](1.13/mips/Dockerfile))
- `s390x`, `1.13-s390x`, `1.13.0-s390x` ([1.13/s390x/Dockerfile](1.13/s390x/Dockerfile))
- `1.12-main`, `1.12.13-main` ([1.12/main/Dockerfile](1.12/main/Dockerfile))
- `arm`, `1.12-arm`, `1.12.13-arm` ([1.12/arm/Dockerfile](1.12/arm/Dockerfile))
- `powerpc`, `1.12-powerpc`, `1.12.13-powerpc` ([1.12/powerpc/Dockerfile](1.12/powerpc/Dockerfile))
- `mips`, `1.12-mips`, `1.12.13-mips` ([1.12/mips/Dockerfile](1.12/mips/Dockerfile))
- `s390x`, `1.12-s390x`, `1.12.13-s390x` ([1.12/s390x/Dockerfile](1.12/s390x/Dockerfile))

## Usage

Expand Down