Skip to content

Commit

Permalink
Merge pull request #34 from openshift-bot/updating-dockerfile.ocp-bas…
Browse files Browse the repository at this point in the history
…eimages-to-mach-ocp-build-data-config

Bug 1872080: Updating Dockerfile.ocp baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Aug 25, 2020
2 parents 7b39891 + 93e776a commit 944c908
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.ocp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.14 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
WORKDIR /go/src/github.com/improbable-eng/thanos
COPY . .
ENV GOFLAGS="-mod=vendor"
Expand All @@ -11,7 +11,7 @@ RUN if ! yum install -y prometheus-promu; then \
curl -s -L https://github.com/prometheus/promu/releases/download/v0.5.0/promu-0.5.0.linux-amd64.tar.gz | tar -xzvf - -C /usr/bin --strip-components 1 promu-0.5.0.linux-amd64/promu; \
fi; \
promu build;
FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
LABEL io.k8s.display-name="OpenShift Thanos" \
io.k8s.description="Highly available Prometheus setup with long term storage capabilities." \
io.openshift.tags="prometheus,monitoring" \
Expand Down

0 comments on commit 944c908

Please sign in to comment.