Skip to content

Commit 83cb781

Browse files
periklisperiklis
committed
Sync dockerfiles with midstream
1 parent caeec38 commit 83cb781

13 files changed

+44
-56
lines changed

‎curator/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
### This is a generated file from Dockerfile.in ###
22

3-
#@follow_tag(openshift-ose-base:ubi8.python.36)
3+
#@follow_tag(registry.redhat.io/ubi8/python-36:latest)
44
FROM registry.ci.openshift.org/ocp/builder:ubi8.python.36
55

6+
67
ENV BUILD_VERSION=5.8.1
78
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
89
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}

‎curator/Dockerfile.in

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
## EXCLUDE BEGIN ##
2-
#@follow_tag(ubi8:8-released)
3-
FROM ubi8:8.2-347 AS builder
2+
#@follow_tag(registry.redhat.io/ubi8:latest)
3+
FROM registry.redhat.io/ubi8:8.4-211 AS builder
44

5-
ARG upstream_code
6-
ENV upstream_code=upstream_code
5+
ARG upstream_code=upstream_code
76
ARG upstream_tarball=${upstream_code}.tar.gz
87

98
COPY ${CI_ARCHIVE_ORIGIN_AGGREGATED_LOGGING} ${upstream_tarball}
@@ -13,8 +12,12 @@ RUN mkdir -p ${upstream_code} \
1312
-C ${upstream_code}
1413
## EXCLUDE END ##
1514

16-
#@follow_tag(openshift-ose-base:ubi8.python.36)
17-
FROM openshift-ose-base:v4.0-202009120102.31989
15+
#@follow_tag(registry.redhat.io/ubi8/python-36:latest)
16+
FROM registry.redhat.io/ubi8/python-36:1-155
17+
18+
## EXCLUDE BEGIN ##
19+
ARG upstream_code=upstream_code/curator
20+
## EXCLUDE END ##
1821

1922
ENV BUILD_VERSION=5.8.1
2023
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}

‎curator/origin-meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from:
2-
- source: openshift-ose-base\:v(?:[\.0-9\-]*)
2+
- source: registry.redhat.io/ubi8/python-36:(\d)-(?:[\.0-9\-]*)
33
target: registry.ci.openshift.org/ocp/builder:ubi8.python.36

‎elasticsearch/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
### This is a generated file from Dockerfile.in ###
22

3-
#@follow_tag(openshift-ose-base:ubi8)
3+
#@follow_tag(registry.redhat.io/ubi8:latest)
44
FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.7
5-
65
ENV BUILD_VERSION=6.8.1
76
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
87
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}

‎elasticsearch/Dockerfile.in

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
## EXCLUDE BEGIN ##
2-
#@follow_tag(openshift-ose-base:ubi8)
3-
FROM openshift-ose-base:v4.0-202104100031.20055 AS builder
2+
#@follow_tag(registry.redhat.io/ubi8:latest)
3+
FROM registry.redhat.io/ubi8:8.4-211 AS builder
44

5-
ARG upstream_code
6-
ENV upstream_code=upstream_code
7-
ARG upstream_tarball=${upstream_code}.tar.gz
5+
ARG upstream_code=upstream_code
6+
ARG upstream_tarball=${upstream_code}.tar.gz
87

98
COPY ${CI_ARCHIVE_ORIGIN_AGGREGATED_LOGGING} ${upstream_tarball}
109
RUN mkdir -p ${upstream_code} \
@@ -13,9 +12,11 @@ RUN mkdir -p ${upstream_code} \
1312
-C ${upstream_code}
1413
## EXCLUDE END ##
1514

16-
#@follow_tag(openshift-ose-base:ubi8)
17-
FROM openshift-ose-base:v4.0-202104100031.20055
18-
15+
#@follow_tag(registry.redhat.io/ubi8:latest)
16+
FROM registry.redhat.io/ubi8:8.4-211
17+
## EXCLUDE BEGIN ##
18+
ARG upstream_code=upstream_code/elasticsearch
19+
## EXCLUDE END ##
1920
ENV BUILD_VERSION=6.8.1
2021
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
2122
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}

‎elasticsearch/origin-meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from:
2-
- source: openshift-ose-base\:v(?:[\.0-9\-]*)
2+
- source: registry.redhat.io/ubi8:(\d).(\d)-(?:[\.0-9\-]*)
33
target: registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.7

‎fluentd/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
### This is a generated file from Dockerfile.in ###
22

3-
#@follow_tag(openshift-ose-base:ubi8.ruby.25)
3+
#@follow_tag(registry.redhat.io/ubi8/ruby-25:latest)
44
FROM registry.ci.openshift.org/ocp/builder:ubi8.ruby.25
5-
65
ENV BUILD_VERSION=1.7.4
76
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
87
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}

‎fluentd/Dockerfile.in

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
## EXCLUDE BEGIN ##
2-
#@follow_tag(ubi8:8-released)
3-
FROM ubi8:8.2-347 AS builder
2+
#@follow_tag(registry.redhat.io/ubi8:latest)
3+
FROM registry.redhat.io/ubi8:8.4-211 AS builder
44

5-
ARG upstream_code
6-
ENV upstream_code=upstream_code
5+
ARG upstream_code=upstream_code
76
ARG upstream_tarball=${upstream_code}.tar.gz
87

98
COPY ${CI_ARCHIVE_ORIGIN_AGGREGATED_LOGGING} ${upstream_tarball}
@@ -13,9 +12,11 @@ RUN mkdir -p ${upstream_code} \
1312
-C ${upstream_code}
1413
## EXCLUDE END ##
1514

16-
#@follow_tag(openshift-ose-base:ubi8.ruby.25)
17-
FROM openshift-ose-base:v4.0-202009120105.6452
18-
15+
#@follow_tag(registry.redhat.io/ubi8/ruby-25:latest)
16+
FROM registry.redhat.io/ubi8/ruby-25:1-164
17+
## EXCLUDE BEGIN ##
18+
ARG upstream_code=upstream_code/fluentd
19+
## EXCLUDE END ##
1920
ENV BUILD_VERSION=1.7.4
2021
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
2122
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}

‎fluentd/origin-meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from:
2-
- source: openshift-ose-base\:v(?:[\.0-9\-]*)
2+
- source: registry.redhat.io/ubi8/ruby-25:(\d)-(?:[\.0-9\-]*)
33
target: registry.ci.openshift.org/ocp/builder:ubi8.ruby.25

‎hack/build-component-image.sh

+1-17
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,8 @@ set -euo pipefail
44

55
dir=$1
66
fullimagename=$2
7-
87
tag_prefix="${OS_IMAGE_PREFIX:-"openshift/origin-"}"
9-
10-
docker_suffix=''
11-
if [ "${fullimagename}" = "openshift/origin-logging-elasticsearch6" ]; then
12-
docker_suffix='.origin'
13-
fi
14-
15-
# TODO(periklis)
16-
# Remove this when all Dockerfile.rhel8
17-
# are renamed back to Dockerfile
18-
if [ "${fullimagename}" = 'openshift/origin-logging-kibana6' ]; then
19-
docker_suffix='.rhel8'
20-
fi
21-
22-
dockerfile="Dockerfile${docker_suffix}"
23-
24-
dfpath=${dir}/${dockerfile}
8+
dfpath=${dir}/Dockerfile
259

2610
echo "----------------------------------------------------------------------------------------------------------------"
2711
echo "- -"

‎kibana/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
### This is a generated file from Dockerfile.in ###
22

3-
#@follow_tag(openshift-ose-base:ubi8.nodejs.10)
3+
#@follow_tag(registry-proxy.engineering.redhat.com/rh-osbs/ubi8-nodejs-10:latest)
44
FROM registry.ci.openshift.org/ocp/builder:ubi8.nodejs.10
5-
65
ENV BUILD_VERSION=6.8.1
76
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
87
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}

‎kibana/Dockerfile.in

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
## EXCLUDE BEGIN ##
22
## extract the tarball
3-
#@follow_tag(ubi8:8-released)
4-
FROM ubi8:8.2-347 AS builder
3+
#@follow_tag(registry.redhat.io/ubi8:latest)
4+
FROM registry.redhat.io/ubi8:8.4-211 AS builder
55

6-
ARG upstream_code
7-
ENV upstream_code=upstream_code
6+
ARG upstream_code=upstream_code
87
ARG upstream_tarball=${upstream_code}.tar.gz
98

109
COPY ${CI_ARCHIVE_ORIGIN_AGGREGATED_LOGGING} ${upstream_tarball}
@@ -14,9 +13,11 @@ RUN mkdir -p ${upstream_code} \
1413
-C ${upstream_code}
1514
## EXCLUDE END ##
1615

17-
#@follow_tag(openshift-ose-base:ubi8.nodejs.10)
18-
FROM openshift-ose-base:v4.0-202009120056.16421
19-
16+
#@follow_tag(registry-proxy.engineering.redhat.com/rh-osbs/ubi8-nodejs-10:latest)
17+
FROM registry-proxy.engineering.redhat.com/rh-osbs/ubi8-nodejs-10:1-142
18+
## EXCLUDE BEGIN ##
19+
ARG upstream_code=upstream_code/kibana
20+
## EXCLUDE END ##
2021
ENV BUILD_VERSION=6.8.1
2122
ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
2223
ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}

‎kibana/origin-meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from:
2-
- source: openshift-ose-base\:v(?:[\.0-9\-]*)
2+
- source: registry-proxy.engineering.redhat.com/rh-osbs/ubi8-nodejs-10:(\d)-(?:[\.0-9\-]*)
33
target: registry.ci.openshift.org/ocp/builder:ubi8.nodejs.10

0 commit comments

Comments
 (0)