update builder image to use go 1.11

openshift · Jan 25, 2019 · 0c13951 · 0c13951
1 parent 727af12
commit 0c13951
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.promu.yml b/.promu.yml
@@ -10,14 +10,13 @@ build:
  path: ./cmd/alertmanager
  - name: amtool
  path: ./cmd/amtool
- flags: -a -tags netgo
+ flags: -mod vendor -a -tags netgo
  ldflags: |
- -s
- -X {{repoPath}}/vendor/github.com/prometheus/common/version.Version={{.Version}}
- -X {{repoPath}}/vendor/github.com/prometheus/common/version.Revision={{.Revision}}
- -X {{repoPath}}/vendor/github.com/prometheus/common/version.Branch={{.Branch}}
- -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
- -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+ -X github.com/prometheus/common/version.Version={{.Version}}
+ -X github.com/prometheus/common/version.Revision={{.Revision}}
+ -X github.com/prometheus/common/version.Branch={{.Branch}}
+ -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+ -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
 tarball:
  files:
  - examples/ha/alertmanager.yml

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.11 AS builder
 
 ARG ALERTMANAGER_GOPATH=/go/src/github.com/prometheus/alertmanager
 COPY . ${ALERTMANAGER_GOPATH}

diff --git a/Dockerfile.rhel b/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
 
 ARG ALERTMANAGER_GOPATH=/go/src/github.com/prometheus/alertmanager
 ARG BUILD_PROMU=false