Merge pull request #28 from paulfantom/base_image

add comment about FROM directives
openshift · Sep 6, 2019 · 6858fa0 · 6858fa0
2 parents 8dd2013 + 66ca42c
commit 6858fa0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Dockerfile.ocp b/Dockerfile.ocp
@@ -1,4 +1,5 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.11 AS builder
+# FROM directives are overriden by CI system (both Prow CI and OSBS)
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
 WORKDIR /go/src/github.com/prometheus/alertmanager
 COPY . .
 RUN if yum install -y prometheus-promu; then export BUILD_PROMU=false; fi && make build