Skip to content

Commit 28bbd94

Browse files
setiahnknize
authored andcommitted
[Rename] Refactoring Elastic references in docker and kerberos builds (opensearch-project#428) (opensearch-project#438)
Signed-off-by: Himanshu Setia <setiah@amazon.com>
1 parent 8469519 commit 28bbd94

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

distribution/docker/src/docker/Dockerfile

+11-11
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN chmod 0660 config/opensearch.yml config/log4j2.properties
6161
6262
FROM ${base_image}
6363
64-
ENV ELASTIC_CONTAINER true
64+
ENV OPENSEARCH_CONTAINER true
6565
6666
RUN for iter in {1..10}; do \\
6767
${package_manager} update --setopt=tsflags=nodocs -y && \\
@@ -103,22 +103,22 @@ EXPOSE 9200 9300
103103

104104
LABEL org.label-schema.build-date="${build_date}" \\
105105
org.label-schema.license="${license}" \\
106-
org.label-schema.name="Elasticsearch" \\
106+
org.label-schema.name="OpenSearch" \\
107107
org.label-schema.schema-version="1.0" \\
108-
org.label-schema.url="https://www.elastic.co/products/elasticsearch" \\
109-
org.label-schema.usage="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \\
108+
org.label-schema.url="https://www.opensearch.org" \\
109+
org.label-schema.usage="https://www.opensearch.org/guide/en/opensearch/reference/index.html" \\
110110
org.label-schema.vcs-ref="${git_revision}" \\
111-
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \\
112-
org.label-schema.vendor="Elastic" \\
111+
org.label-schema.vcs-url="https://github.com/opensearch-project/OpenSearch" \\
112+
org.label-schema.vendor="OpenSearch" \\
113113
org.label-schema.version="${version}" \\
114114
org.opencontainers.image.created="${build_date}" \\
115-
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \\
115+
org.opencontainers.image.documentation="https://www.opensearch.org/guide/en/opensearch/reference/index.html" \\
116116
org.opencontainers.image.licenses="${license}" \\
117117
org.opencontainers.image.revision="${git_revision}" \\
118-
org.opencontainers.image.source="https://github.com/elastic/elasticsearch" \\
119-
org.opencontainers.image.title="Elasticsearch" \\
120-
org.opencontainers.image.url="https://www.elastic.co/products/elasticsearch" \\
121-
org.opencontainers.image.vendor="Elastic" \\
118+
org.opencontainers.image.source="https://github.com/opensearch-project/OpenSearch" \\
119+
org.opencontainers.image.title="OpenSearch" \\
120+
org.opencontainers.image.url="https://www.opensearch.org" \\
121+
org.opencontainers.image.vendor="OpenSearch" \\
122122
org.opencontainers.image.version="${version}"
123123

124124
ENTRYPOINT ["/tini", "--", "/usr/local/bin/docker-entrypoint.sh"]

test/fixtures/krb5kdc-fixture/docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3'
22
services:
33
peppa:
4-
hostname: kerberos.build.elastic.co
4+
hostname: kerberos.build.opensearch.org
55
build:
66
context: .
77
dockerfile: Dockerfile
@@ -14,7 +14,7 @@ services:
1414
- "4444"
1515
- "88/udp"
1616
hdfs:
17-
hostname: kerberos.build.elastic.co
17+
hostname: kerberos.build.opensearch.org
1818
build:
1919
context: .
2020
dockerfile: Dockerfile

test/fixtures/krb5kdc-fixture/src/main/resources/env.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
realm=BUILD.ELASTIC.CO
19-
kdc=kerberos.build.elastic.co
20-
zone=build.elastic.co
18+
realm=BUILD.OPENSEARCH.ORG
19+
kdc=kerberos.build.opensearch.org
20+
zone=build.opensearch.org

0 commit comments

Comments
 (0)