honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-22 12:56:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ubi in UBI-based Docker image tags to the name (#48728)

Browse Source 
After some consideration, we are electing to make "ubi" part of the
image name instead of part of the tag. This commit implements that
change for the Elasticsearch UBI-based Docker images.
This commit is contained in:
Jason Tedor 2019-10-30 23:48:06 -04:00
parent 919596b2e8
commit 51179f162a
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
distribution/docker/build.gradle
View File

@ -154,15 +154,15 @@ void addBuildDockerImage(final boolean oss, final boolean ubi) {
List<String> tags
if (oss) {
tags = [
"docker.elastic.co/elasticsearch/elasticsearch-oss:${VersionProperties.elasticsearch}${ubi ? '-ubi7' : ''}",
"elasticsearch-oss:test${ubi ? '-ubi7' : ''}"
"docker.elastic.co/elasticsearch/elasticsearch-oss${ubi ? '-ubi7' : ''}:${VersionProperties.elasticsearch}",
"elasticsearch-oss${ubi ? '-ubi7' : ''}:test"
]
} else {
tags = [
"elasticsearch:${VersionProperties.elasticsearch}${ubi ? '-ubi7' : ''}",
"docker.elastic.co/elasticsearch/elasticsearch:${VersionProperties.elasticsearch}${ubi ? '-ubi7' : ''}",
"docker.elastic.co/elasticsearch/elasticsearch-full:${VersionProperties.elasticsearch}${ubi ? '-ubi7' : ''}",
"elasticsearch:test${ubi ? '-ubi7' : ''}",
"elasticsearch${ubi ? '-ubi7' : ''}:${VersionProperties.elasticsearch}",
"docker.elastic.co/elasticsearch/elasticsearch${ubi ? '-ubi7' : ''}:${VersionProperties.elasticsearch}",
"docker.elastic.co/elasticsearch/elasticsearch${ubi ? '-ubi7' : ''}-full:${VersionProperties.elasticsearch}",
"elasticsearch${ubi ? '-ubi7' : ''}:test",
]
}
executable 'docker'