diff --git a/1.11/Makefile.COMMON b/1.13/Makefile.COMMON similarity index 97% rename from 1.11/Makefile.COMMON rename to 1.13/Makefile.COMMON index 7ec7bee..c56b167 100644 --- a/1.11/Makefile.COMMON +++ b/1.13/Makefile.COMMON @@ -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))) diff --git a/1.11/arm/.dockerignore b/1.13/arm/.dockerignore similarity index 100% rename from 1.11/arm/.dockerignore rename to 1.13/arm/.dockerignore diff --git a/1.11/arm/Dockerfile b/1.13/arm/Dockerfile similarity index 88% rename from 1.11/arm/Dockerfile rename to 1.13/arm/Dockerfile index 1240f3b..6383dca 100644 --- a/1.11/arm/Dockerfile +++ b/1.13/arm/Dockerfile @@ -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 RUN \ diff --git a/1.11/arm/Makefile b/1.13/arm/Makefile similarity index 100% rename from 1.11/arm/Makefile rename to 1.13/arm/Makefile diff --git a/1.11/arm/rootfs/builder.sh b/1.13/arm/rootfs/builder.sh similarity index 100% rename from 1.11/arm/rootfs/builder.sh rename to 1.13/arm/rootfs/builder.sh diff --git a/1.11/base/.dockerignore b/1.13/base/.dockerignore similarity index 100% rename from 1.11/base/.dockerignore rename to 1.13/base/.dockerignore diff --git a/1.11/base/Dockerfile b/1.13/base/Dockerfile similarity index 88% rename from 1.11/base/Dockerfile rename to 1.13/base/Dockerfile index f7effe2..e2a5e86 100644 --- a/1.11/base/Dockerfile +++ b/1.13/base/Dockerfile @@ -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 - \ diff --git a/1.11/base/Makefile b/1.13/base/Makefile similarity index 100% rename from 1.11/base/Makefile rename to 1.13/base/Makefile diff --git a/1.11/base/rootfs/builder.sh b/1.13/base/rootfs/builder.sh similarity index 100% rename from 1.11/base/rootfs/builder.sh rename to 1.13/base/rootfs/builder.sh diff --git a/1.11/base/rootfs/common.sh b/1.13/base/rootfs/common.sh similarity index 100% rename from 1.11/base/rootfs/common.sh rename to 1.13/base/rootfs/common.sh diff --git a/1.11/main/.dockerignore b/1.13/main/.dockerignore similarity index 100% rename from 1.11/main/.dockerignore rename to 1.13/main/.dockerignore diff --git a/1.11/main/Dockerfile b/1.13/main/Dockerfile similarity index 95% rename from 1.11/main/Dockerfile rename to 1.13/main/Dockerfile index 3fd8d43..8acf365 100644 --- a/1.11/main/Dockerfile +++ b/1.13/main/Dockerfile @@ -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 RUN \ diff --git a/1.11/main/Makefile b/1.13/main/Makefile similarity index 100% rename from 1.11/main/Makefile rename to 1.13/main/Makefile diff --git a/1.11/main/rootfs/builder.sh b/1.13/main/rootfs/builder.sh similarity index 100% rename from 1.11/main/rootfs/builder.sh rename to 1.13/main/rootfs/builder.sh diff --git a/1.11/mips/.dockerignore b/1.13/mips/.dockerignore similarity index 100% rename from 1.11/mips/.dockerignore rename to 1.13/mips/.dockerignore diff --git a/1.11/mips/Dockerfile b/1.13/mips/Dockerfile similarity index 92% rename from 1.11/mips/Dockerfile rename to 1.13/mips/Dockerfile index d9c1a5e..392fd81 100644 --- a/1.11/mips/Dockerfile +++ b/1.13/mips/Dockerfile @@ -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 RUN \ diff --git a/1.11/mips/Makefile b/1.13/mips/Makefile similarity index 100% rename from 1.11/mips/Makefile rename to 1.13/mips/Makefile diff --git a/1.11/mips/rootfs/builder.sh b/1.13/mips/rootfs/builder.sh similarity index 100% rename from 1.11/mips/rootfs/builder.sh rename to 1.13/mips/rootfs/builder.sh diff --git a/1.11/powerpc/.dockerignore b/1.13/powerpc/.dockerignore similarity index 100% rename from 1.11/powerpc/.dockerignore rename to 1.13/powerpc/.dockerignore diff --git a/1.11/powerpc/Dockerfile b/1.13/powerpc/Dockerfile similarity index 83% rename from 1.11/powerpc/Dockerfile rename to 1.13/powerpc/Dockerfile index 9c33164..1fbf09a 100644 --- a/1.11/powerpc/Dockerfile +++ b/1.13/powerpc/Dockerfile @@ -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 RUN \ diff --git a/1.11/powerpc/Makefile b/1.13/powerpc/Makefile similarity index 100% rename from 1.11/powerpc/Makefile rename to 1.13/powerpc/Makefile diff --git a/1.11/powerpc/rootfs/builder.sh b/1.13/powerpc/rootfs/builder.sh similarity index 100% rename from 1.11/powerpc/rootfs/builder.sh rename to 1.13/powerpc/rootfs/builder.sh diff --git a/1.11/s390x/Dockerfile b/1.13/s390x/Dockerfile similarity index 83% rename from 1.11/s390x/Dockerfile rename to 1.13/s390x/Dockerfile index 85385db..6de4c89 100644 --- a/1.11/s390x/Dockerfile +++ b/1.13/s390x/Dockerfile @@ -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 RUN \ diff --git a/1.11/s390x/Makefile b/1.13/s390x/Makefile similarity index 100% rename from 1.11/s390x/Makefile rename to 1.13/s390x/Makefile diff --git a/1.11/s390x/rootfs/builder.sh b/1.13/s390x/rootfs/builder.sh similarity index 100% rename from 1.11/s390x/rootfs/builder.sh rename to 1.13/s390x/rootfs/builder.sh diff --git a/Makefile b/Makefile index 9bace20..6b2082f 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index 63f4fcd..636bed2 100644 --- a/README.md +++ b/README.md @@ -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