Skip to content

Commit

Permalink
Merge pull request thanos-io#117 from openshift-bot/art-consistency-o…
Browse files Browse the repository at this point in the history
…penshift-4.15-thanos

OCPBUGS-19206: Updating thanos images to be consistent with ART
  • Loading branch information
openshift-merge-robot authored Sep 22, 2023
2 parents 4312298 + 032307b commit a91c734
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.20-openshift-4.14
tag: rhel-8-release-golang-1.20-openshift-4.15
4 changes: 2 additions & 2 deletions Dockerfile.ocp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 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.ci.openshift.org/ocp/4.14:base
FROM registry.ci.openshift.org/ocp/4.15: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 a91c734

Please sign in to comment.