[Rename] Refactoring Elastic references in docker and kerberos builds (#428) (#438)

Signed-off-by: Himanshu Setia <setiah@amazon.com>
This commit is contained in:
Himanshu Setia 2021-03-21 22:53:46 -07:00 committed by Nicholas Walter Knize
parent 8469519413
commit 28bbd94d6f
No known key found for this signature in database
GPG Key ID: 51F0CC22F625308A
3 changed files with 16 additions and 16 deletions

View File

@ -61,7 +61,7 @@ RUN chmod 0660 config/opensearch.yml config/log4j2.properties
FROM ${base_image}
ENV ELASTIC_CONTAINER true
ENV OPENSEARCH_CONTAINER true
RUN for iter in {1..10}; do \\
${package_manager} update --setopt=tsflags=nodocs -y && \\
@ -103,22 +103,22 @@ EXPOSE 9200 9300
LABEL org.label-schema.build-date="${build_date}" \\
org.label-schema.license="${license}" \\
org.label-schema.name="Elasticsearch" \\
org.label-schema.name="OpenSearch" \\
org.label-schema.schema-version="1.0" \\
org.label-schema.url="https://www.elastic.co/products/elasticsearch" \\
org.label-schema.usage="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \\
org.label-schema.url="https://www.opensearch.org" \\
org.label-schema.usage="https://www.opensearch.org/guide/en/opensearch/reference/index.html" \\
org.label-schema.vcs-ref="${git_revision}" \\
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \\
org.label-schema.vendor="Elastic" \\
org.label-schema.vcs-url="https://github.com/opensearch-project/OpenSearch" \\
org.label-schema.vendor="OpenSearch" \\
org.label-schema.version="${version}" \\
org.opencontainers.image.created="${build_date}" \\
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \\
org.opencontainers.image.documentation="https://www.opensearch.org/guide/en/opensearch/reference/index.html" \\
org.opencontainers.image.licenses="${license}" \\
org.opencontainers.image.revision="${git_revision}" \\
org.opencontainers.image.source="https://github.com/elastic/elasticsearch" \\
org.opencontainers.image.title="Elasticsearch" \\
org.opencontainers.image.url="https://www.elastic.co/products/elasticsearch" \\
org.opencontainers.image.vendor="Elastic" \\
org.opencontainers.image.source="https://github.com/opensearch-project/OpenSearch" \\
org.opencontainers.image.title="OpenSearch" \\
org.opencontainers.image.url="https://www.opensearch.org" \\
org.opencontainers.image.vendor="OpenSearch" \\
org.opencontainers.image.version="${version}"
ENTRYPOINT ["/tini", "--", "/usr/local/bin/docker-entrypoint.sh"]

View File

@ -1,7 +1,7 @@
version: '3'
services:
peppa:
hostname: kerberos.build.elastic.co
hostname: kerberos.build.opensearch.org
build:
context: .
dockerfile: Dockerfile
@ -14,7 +14,7 @@ services:
- "4444"
- "88/udp"
hdfs:
hostname: kerberos.build.elastic.co
hostname: kerberos.build.opensearch.org
build:
context: .
dockerfile: Dockerfile

View File

@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
realm=BUILD.ELASTIC.CO
kdc=kerberos.build.elastic.co
zone=build.elastic.co
realm=BUILD.OPENSEARCH.ORG
kdc=kerberos.build.opensearch.org
zone=build.opensearch.org