Skip to content

Commit 6f6a94b

Browse files
vimalk78vimalk78
committed
Fixed upstream versions
 elasticsearch: 6.8.1 kibana: 6.8.1 fluentd: 1.7.4 curator: 5.8.1
1 parent 61b666f commit 6f6a94b

File tree

8 files changed

+16
-38
lines changed

8 files changed

+16
-38
lines changed

‎curator/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
#@follow_tag(openshift-ose-base:ubi8.python.36)
44
FROM registry.ci.openshift.org/ocp/builder:ubi8.python.36
55

6-
ENV BUILD_VERSION=${CI_CONTAINER_VERSION:-}
7-
ENV OS_GIT_MAJOR=${CI_X_VERSION:-}
8-
ENV OS_GIT_MINOR=${CI_Y_VERSION:-}
9-
ENV OS_GIT_PATCH=${CI_Z_VERSION:-}
6+
ENV BUILD_VERSION=5.8.1
107
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
118
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
129

@@ -22,7 +19,7 @@ LABEL \
2219
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
2320
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
2421
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
25-
version=${CI_CONTAINER_VERSION}
22+
version=v5.8.1
2623

2724
MAINTAINER OpenShift Development <[email protected]>
2825

‎curator/Dockerfile.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ RUN mkdir -p ${upstream_code} \
1616
#@follow_tag(openshift-ose-base:ubi8.python.36)
1717
FROM openshift-ose-base:v4.0-202009120102.31989
1818

19-
ENV BUILD_VERSION=${CI_CONTAINER_VERSION:-}
20-
ENV OS_GIT_MAJOR=${CI_X_VERSION:-}
21-
ENV OS_GIT_MINOR=${CI_Y_VERSION:-}
22-
ENV OS_GIT_PATCH=${CI_Z_VERSION:-}
19+
ENV BUILD_VERSION=5.8.1
2320
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
2421
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
2522

@@ -35,7 +32,7 @@ LABEL \
3532
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
3633
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
3734
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
38-
version=${CI_CONTAINER_VERSION}
35+
version=v5.8.1
3936

4037
MAINTAINER OpenShift Development <[email protected]>
4138

‎elasticsearch/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
#@follow_tag(openshift-ose-base:ubi8)
44
FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.7
55

6-
ENV BUILD_VERSION=${CI_CONTAINER_VERSION:-}
7-
ENV OS_GIT_MAJOR=${CI_X_VERSION:-}
8-
ENV OS_GIT_MINOR=${CI_Y_VERSION:-}
6+
ENV BUILD_VERSION=6.8.1
97
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
108
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
119

@@ -21,7 +19,7 @@ LABEL \
2119
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
2220
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
2321
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
24-
version=${CI_CONTAINER_VERSION}
22+
version=v6.8.1
2523

2624
MAINTAINER OpenShift Development <[email protected]>
2725

‎elasticsearch/Dockerfile.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ RUN mkdir -p ${upstream_code} \
1616
#@follow_tag(openshift-ose-base:ubi8)
1717
FROM openshift-ose-base:v4.0-202104100031.20055
1818

19-
ENV BUILD_VERSION=${CI_CONTAINER_VERSION:-}
20-
ENV OS_GIT_MAJOR=${CI_X_VERSION:-}
21-
ENV OS_GIT_MINOR=${CI_Y_VERSION:-}
19+
ENV BUILD_VERSION=6.8.1
2220
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
2321
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
2422

@@ -34,7 +32,7 @@ LABEL \
3432
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
3533
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
3634
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
37-
version=${CI_CONTAINER_VERSION}
35+
version=v6.8.1
3836

3937
MAINTAINER OpenShift Development <[email protected]>
4038

‎fluentd/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
#@follow_tag(openshift-ose-base:ubi8.ruby.25)
44
FROM registry.ci.openshift.org/ocp/builder:ubi8.ruby.25
55

6-
ENV BUILD_VERSION=${CI_CONTAINER_VERSION:-}
7-
ENV OS_GIT_MAJOR=${CI_X_VERSION:-}
8-
ENV OS_GIT_MINOR=${CI_Y_VERSION:-}
9-
ENV OS_GIT_PATCH=${CI_Z_VERSION:-}
6+
ENV BUILD_VERSION=1.7.4
107
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
118
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
129

@@ -22,7 +19,7 @@ LABEL \
2219
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
2320
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
2421
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
25-
version=${CI_CONTAINER_VERSION}
22+
version=v1.7.4
2623

2724
MAINTAINER OpenShift Development <[email protected]>
2825

‎fluentd/Dockerfile.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ RUN mkdir -p ${upstream_code} \
1616
#@follow_tag(openshift-ose-base:ubi8.ruby.25)
1717
FROM openshift-ose-base:v4.0-202009120105.6452
1818

19-
ENV BUILD_VERSION=${CI_CONTAINER_VERSION:-}
20-
ENV OS_GIT_MAJOR=${CI_X_VERSION:-}
21-
ENV OS_GIT_MINOR=${CI_Y_VERSION:-}
22-
ENV OS_GIT_PATCH=${CI_Z_VERSION:-}
19+
ENV BUILD_VERSION=1.7.4
2320
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
2421
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
2522

@@ -35,7 +32,7 @@ LABEL \
3532
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
3633
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
3734
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
38-
version=${CI_CONTAINER_VERSION}
35+
version=v1.7.4
3936

4037
MAINTAINER OpenShift Development <[email protected]>
4138

‎kibana/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
#@follow_tag(openshift-ose-base:ubi8.nodejs.10)
44
FROM registry.ci.openshift.org/ocp/builder:ubi8.nodejs.10
55

6-
ENV BUILD_VERSION=${CI_CONTAINER_VERSION:-}
7-
ENV OS_GIT_MAJOR=${CI_X_VERSION:-}
8-
ENV OS_GIT_MINOR=${CI_Y_VERSION:-}
9-
ENV OS_GIT_PATCH=${CI_Z_VERSION:-}
6+
ENV BUILD_VERSION=6.8.1
107
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
118
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
129

@@ -36,7 +33,7 @@ LABEL \
3633
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
3734
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
3835
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
39-
version=${CI_CONTAINER_VERSION}
36+
version=v6.8.1
4037
ARG LOCAL_REPO
4138

4239
USER 0

‎kibana/Dockerfile.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ RUN mkdir -p ${upstream_code} \
1717
#@follow_tag(openshift-ose-base:ubi8.nodejs.10)
1818
FROM openshift-ose-base:v4.0-202009120056.16421
1919

20-
ENV BUILD_VERSION=${CI_CONTAINER_VERSION:-}
21-
ENV OS_GIT_MAJOR=${CI_X_VERSION:-}
22-
ENV OS_GIT_MINOR=${CI_Y_VERSION:-}
23-
ENV OS_GIT_PATCH=${CI_Z_VERSION:-}
20+
ENV BUILD_VERSION=6.8.1
2421
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
2522
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
2623

@@ -50,7 +47,7 @@ LABEL \
5047
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
5148
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
5249
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
53-
version=${CI_CONTAINER_VERSION}
50+
version=v6.8.1
5451
ARG LOCAL_REPO
5552

5653
USER 0

0 commit comments

Comments
 (0)