Skip to content

Commit e7f2386

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #2180 from periklis/sync-midstream
Sync dockefiles with midstream
2 parents 4508af3 + 800b8ea commit e7f2386

File tree

8 files changed

+112
-111
lines changed

8 files changed

+112
-111
lines changed

‎curator/Dockerfile

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,6 @@ ENV BUILD_VERSION=5.8.1
77
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
88
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
99

10-
LABEL \
11-
License="GPLv2+" \
12-
io.k8s.description="Curator elasticsearch container for elasticsearch deletion/archival" \
13-
io.k8s.display-name="Curator 5" \
14-
io.openshift.tags="logging,elk,elasticsearch,curator" \
15-
vendor="Red Hat" \
16-
name="openshift/ose-logging-curator5" \
17-
com.redhat.component="logging-curator5-container" \
18-
io.openshift.maintainer.product="OpenShift Container Platform" \
19-
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
20-
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
21-
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
22-
version=v5.8.1
23-
2410
MAINTAINER OpenShift Development <[email protected]>
2511

2612
ENV HOME=/opt/app-root/src \
@@ -57,3 +43,18 @@ RUN pip install $(ls . | grep -v curator) -q --no-index --find-links . && \
5743
WORKDIR ${HOME}
5844
USER 1001
5945
CMD ["sh", "run.sh"]
46+
47+
LABEL \
48+
License="GPLv2+" \
49+
io.k8s.description="Curator elasticsearch container for elasticsearch deletion/archival" \
50+
io.k8s.display-name="Curator 5" \
51+
io.openshift.tags="logging,elk,elasticsearch,curator" \
52+
vendor="Red Hat" \
53+
name="openshift-logging/logging-curator5-rhel8" \
54+
com.redhat.component="logging-curator5-container" \
55+
io.openshift.maintainer.product="OpenShift Container Platform" \
56+
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
57+
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
58+
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
59+
version=v5.8.1
60+

‎curator/Dockerfile.in

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@ ENV BUILD_VERSION=5.8.1
2020
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
2121
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
2222

23-
LABEL \
24-
License="GPLv2+" \
25-
io.k8s.description="Curator elasticsearch container for elasticsearch deletion/archival" \
26-
io.k8s.display-name="Curator 5" \
27-
io.openshift.tags="logging,elk,elasticsearch,curator" \
28-
vendor="Red Hat" \
29-
name="openshift/ose-logging-curator5" \
30-
com.redhat.component="logging-curator5-container" \
31-
io.openshift.maintainer.product="OpenShift Container Platform" \
32-
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
33-
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
34-
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
35-
version=v5.8.1
36-
3723
MAINTAINER OpenShift Development <[email protected]>
3824

3925
ENV HOME=/opt/app-root/src \
@@ -69,4 +55,18 @@ RUN pip install $(ls . | grep -v curator) -q --no-index --find-links . && \
6955

7056
WORKDIR ${HOME}
7157
USER 1001
72-
CMD ["sh", "run.sh"]
58+
CMD ["sh", "run.sh"]
59+
60+
LABEL \
61+
License="GPLv2+" \
62+
io.k8s.description="Curator elasticsearch container for elasticsearch deletion/archival" \
63+
io.k8s.display-name="Curator 5" \
64+
io.openshift.tags="logging,elk,elasticsearch,curator" \
65+
vendor="Red Hat" \
66+
name="openshift-logging/logging-curator5-rhel8" \
67+
com.redhat.component="logging-curator5-container" \
68+
io.openshift.maintainer.product="OpenShift Container Platform" \
69+
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
70+
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
71+
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
72+
version=v5.8.1

‎elasticsearch/Dockerfile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,6 @@ ENV BUILD_VERSION=6.8.1
77
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
88
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
99

10-
LABEL \
11-
License="GPLv2+" \
12-
io.k8s.description="Elasticsearch container for EFK aggregated logging storage" \
13-
io.k8s.display-name="Elasticsearch 6" \
14-
io.openshift.tags="logging,elk,elasticsearch" \
15-
vendor="Red Hat" \
16-
name="openshift-logging/elasticsearch6-rhel8" \
17-
com.redhat.component="logging-elasticsearch6-container" \
18-
io.openshift.maintainer.product="OpenShift Container Platform" \
19-
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
20-
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
21-
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
22-
version=v6.8.1
23-
2410
MAINTAINER OpenShift Development <[email protected]>
2511

2612
EXPOSE 9200
@@ -97,4 +83,17 @@ WORKDIR ${HOME}
9783
USER 1000
9884
CMD ["sh", "/opt/app-root/src/run.sh"]
9985

86+
LABEL \
87+
License="GPLv2+" \
88+
io.k8s.description="Elasticsearch container for EFK aggregated logging storage" \
89+
io.k8s.display-name="Elasticsearch 6" \
90+
io.openshift.tags="logging,elk,elasticsearch" \
91+
vendor="Red Hat" \
92+
name="openshift-logging/elasticsearch6-rhel8" \
93+
com.redhat.component="logging-elasticsearch6-container" \
94+
io.openshift.maintainer.product="OpenShift Container Platform" \
95+
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
96+
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
97+
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
98+
version=v6.8.1
10099

‎elasticsearch/Dockerfile.in

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@ ENV BUILD_VERSION=6.8.1
2020
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
2121
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
2222

23-
LABEL \
24-
License="GPLv2+" \
25-
io.k8s.description="Elasticsearch container for EFK aggregated logging storage" \
26-
io.k8s.display-name="Elasticsearch 6" \
27-
io.openshift.tags="logging,elk,elasticsearch" \
28-
vendor="Red Hat" \
29-
name="openshift-logging/elasticsearch6-rhel8" \
30-
com.redhat.component="logging-elasticsearch6-container" \
31-
io.openshift.maintainer.product="OpenShift Container Platform" \
32-
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
33-
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
34-
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
35-
version=v6.8.1
36-
3723
MAINTAINER OpenShift Development <[email protected]>
3824

3925
EXPOSE 9200
@@ -113,3 +99,16 @@ WORKDIR ${HOME}
11399
USER 1000
114100
CMD ["sh", "/opt/app-root/src/run.sh"]
115101

102+
LABEL \
103+
License="GPLv2+" \
104+
io.k8s.description="Elasticsearch container for EFK aggregated logging storage" \
105+
io.k8s.display-name="Elasticsearch 6" \
106+
io.openshift.tags="logging,elk,elasticsearch" \
107+
vendor="Red Hat" \
108+
name="openshift-logging/elasticsearch6-rhel8" \
109+
com.redhat.component="logging-elasticsearch6-container" \
110+
io.openshift.maintainer.product="OpenShift Container Platform" \
111+
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
112+
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
113+
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
114+
version=v6.8.1

‎fluentd/Dockerfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,6 @@ ENV BUILD_VERSION=1.7.4
77
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
88
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
99

10-
LABEL \
11-
License="GPLv2+" \
12-
io.k8s.description="Fluentd container for collecting of container logs" \
13-
io.k8s.display-name="Fluentd" \
14-
io.openshift.tags="logging,elk,fluentd" \
15-
vendor="Red Hat" \
16-
name="openshift/ose-logging-fluentd" \
17-
com.redhat.component="logging-fluentd-container" \
18-
io.openshift.maintainer.product="OpenShift Container Platform" \
19-
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
20-
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
21-
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
22-
version=v1.7.4
23-
2410
MAINTAINER OpenShift Development <[email protected]>
2511

2612
ARG DATA_VERSION_VALUE=1.6.0
@@ -106,3 +92,17 @@ RUN mkdir -p /etc/fluent/configs.d/user && \
10692
WORKDIR ${HOME}
10793
CMD ["sh", "run.sh"]
10894

95+
LABEL \
96+
License="GPLv2+" \
97+
io.k8s.description="Fluentd container for collecting of container logs" \
98+
io.k8s.display-name="Fluentd" \
99+
io.openshift.tags="logging,elk,fluentd" \
100+
vendor="Red Hat" \
101+
name="openshift-logging/fluentd-rhel8" \
102+
com.redhat.component="logging-fluentd-container" \
103+
io.openshift.maintainer.product="OpenShift Container Platform" \
104+
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
105+
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
106+
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
107+
version=v1.7.4
108+

‎fluentd/Dockerfile.in

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@ ENV BUILD_VERSION=1.7.4
2020
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
2121
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
2222

23-
LABEL \
24-
License="GPLv2+" \
25-
io.k8s.description="Fluentd container for collecting of container logs" \
26-
io.k8s.display-name="Fluentd" \
27-
io.openshift.tags="logging,elk,fluentd" \
28-
vendor="Red Hat" \
29-
name="openshift/ose-logging-fluentd" \
30-
com.redhat.component="logging-fluentd-container" \
31-
io.openshift.maintainer.product="OpenShift Container Platform" \
32-
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
33-
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
34-
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
35-
version=v1.7.4
36-
3723
MAINTAINER OpenShift Development <[email protected]>
3824

3925
ARG DATA_VERSION_VALUE=1.6.0
@@ -121,3 +107,17 @@ RUN mkdir -p /etc/fluent/configs.d/user && \
121107

122108
WORKDIR ${HOME}
123109
CMD ["sh", "run.sh"]
110+
111+
LABEL \
112+
License="GPLv2+" \
113+
io.k8s.description="Fluentd container for collecting of container logs" \
114+
io.k8s.display-name="Fluentd" \
115+
io.openshift.tags="logging,elk,fluentd" \
116+
vendor="Red Hat" \
117+
name="openshift-logging/fluentd-rhel8" \
118+
com.redhat.component="logging-fluentd-container" \
119+
io.openshift.maintainer.product="OpenShift Container Platform" \
120+
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
121+
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
122+
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
123+
version=v1.7.4

‎kibana/Dockerfile

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,6 @@ ENV ELASTICSEARCH_URL=https://elasticsearch.openshift-logging.svc.cluster.local:
2121
NODE_ENV=production \
2222
NODE_PATH=/usr/bin
2323

24-
LABEL \
25-
License="GPLv2+" \
26-
io.k8s.description="Kibana container for querying Elasticsearch for aggregated logs" \
27-
io.k8s.display-name="Kibana" \
28-
io.openshift.tags="logging,elk,kibana" \
29-
vendor="Red Hat" \
30-
name="openshift/ose-logging-kibana6" \
31-
com.redhat.component="logging-kibana6-container" \
32-
io.openshift.maintainer.product="OpenShift Container Platform" \
33-
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
34-
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
35-
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
36-
version=v6.8.1
3724
ARG LOCAL_REPO
3825

3926
USER 0
@@ -58,3 +45,17 @@ RUN bin/kibana --optimize
5845
WORKDIR ${HOME}
5946
CMD ["./run.sh"]
6047

48+
LABEL \
49+
License="GPLv2+" \
50+
io.k8s.description="Kibana container for querying Elasticsearch for aggregated logs" \
51+
io.k8s.display-name="Kibana" \
52+
io.openshift.tags="logging,elk,kibana" \
53+
vendor="Red Hat" \
54+
name="openshift-logging/kibana6-rhel8" \
55+
com.redhat.component="logging-kibana6-container" \
56+
io.openshift.maintainer.product="OpenShift Container Platform" \
57+
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
58+
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
59+
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
60+
version=v6.8.1
61+

‎kibana/Dockerfile.in

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,6 @@ ENV ELASTICSEARCH_URL=https://elasticsearch.openshift-logging.svc.cluster.local:
3535
NODE_ENV=production \
3636
NODE_PATH=/usr/bin
3737

38-
LABEL \
39-
License="GPLv2+" \
40-
io.k8s.description="Kibana container for querying Elasticsearch for aggregated logs" \
41-
io.k8s.display-name="Kibana" \
42-
io.openshift.tags="logging,elk,kibana" \
43-
vendor="Red Hat" \
44-
name="openshift/ose-logging-kibana6" \
45-
com.redhat.component="logging-kibana6-container" \
46-
io.openshift.maintainer.product="OpenShift Container Platform" \
47-
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
48-
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
49-
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
50-
version=v6.8.1
5138
ARG LOCAL_REPO
5239

5340
USER 0
@@ -74,3 +61,17 @@ RUN bin/kibana --optimize
7461

7562
WORKDIR ${HOME}
7663
CMD ["./run.sh"]
64+
65+
LABEL \
66+
License="GPLv2+" \
67+
io.k8s.description="Kibana container for querying Elasticsearch for aggregated logs" \
68+
io.k8s.display-name="Kibana" \
69+
io.openshift.tags="logging,elk,kibana" \
70+
vendor="Red Hat" \
71+
name="openshift-logging/kibana6-rhel8" \
72+
com.redhat.component="logging-kibana6-container" \
73+
io.openshift.maintainer.product="OpenShift Container Platform" \
74+
io.openshift.build.commit.id=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
75+
io.openshift.build.source-location=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL} \
76+
io.openshift.build.commit.url=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL}/commit/${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT} \
77+
version=v6.8.1

0 commit comments

Comments
 (0)