Skip to content

Commit

Permalink
Update name to OpenSearch Dashboards
Browse files Browse the repository at this point in the history
  • Loading branch information
jgough committed Apr 14, 2021
1 parent f846f33 commit 68d71e4
Showing 1 changed file with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

################################################################################
# Build stage 0 `builder`:
# Extract OpenSearch-Dashboards artifact
# Extract OpenSearch Dashboards artifact
################################################################################
FROM {{{baseOSImage}}} AS builder

Expand All @@ -30,14 +30,14 @@ RUN mkdir /usr/share/opensearch-dashboards
WORKDIR /usr/share/opensearch-dashboards
RUN tar --strip-components=1 -zxf /opt/{{artifactTarball}}
# Ensure that group permissions are the same as user permissions.
# This will help when relying on GID-0 to run OpenSearch-Dashboards, rather than UID-1000.
# This will help when relying on GID-0 to run OpenSearch Dashboards, rather than UID-1000.
# OpenShift does this, for example.
# REF: https://docs.openshift.org/latest/creating_images/guidelines.html
RUN chmod -R g=u /usr/share/opensearch-dashboards
RUN find /usr/share/opensearch-dashboards -type d -exec chmod g+s {} \;

################################################################################
# Build stage 1 (the actual OpenSearch-Dashboards image):
# Build stage 1 (the actual OpenSearch Dashboards image):
#
# Copy opensearch-dashboards from stage 0
# Add entrypoint
Expand Down Expand Up @@ -69,19 +69,19 @@ RUN curl -L -o /usr/share/fonts/local/NotoSansCJK-Regular.ttc https://github.com
RUN echo "5dcd1c336cc9344cb77c03a0cd8982ca8a7dc97d620fd6c9c434e02dcb1ceeb3 /usr/share/fonts/local/NotoSansCJK-Regular.ttc" | sha256sum -c -
RUN fc-cache -v

# Bring in OpenSearch-Dashboards from the initial stage.
# Bring in OpenSearch Dashboards from the initial stage.
COPY --from=builder --chown=1000:0 /usr/share/opensearch-dashboards /usr/share/opensearch-dashboards
WORKDIR /usr/share/opensearch-dashboards
RUN ln -s /usr/share/opensearch-dashboards /opt/opensearch-dashboards

ENV OPENSEARCH_CONTAINER true
ENV PATH=/usr/share/opensearch-dashboards/bin:$PATH

# Set some OpenSearch-Dashboards configuration defaults.
# Set some OpenSearch Dashboards configuration defaults.
COPY --chown=1000:0 config/opensearch_dashboards.yml /usr/share/opensearch-dashboards/config/opensearch_dashboards.yml

# Add the launcher/wrapper script. It knows how to interpret environment
# variables and translate them to OpenSearch-Dashboards CLI options.
# variables and translate them to OpenSearch Dashboards CLI options.
COPY --chown=1000:0 bin/opensearch-dashboards-docker /usr/local/bin/

# Ensure gid 0 write permissions for OpenShift.
Expand All @@ -99,7 +99,7 @@ RUN groupadd --gid 1000 opensearch-dashboards && \

LABEL org.label-schema.build-date="{{dockerBuildDate}}" \
org.label-schema.license="{{license}}" \
org.label-schema.name="OpenSearch-Dashboards" \
org.label-schema.name="OpenSearch Dashboards" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://www.opensearch.org/" \
org.label-schema.usage="https://www.opensearch.org/" \
Expand All @@ -112,17 +112,17 @@ LABEL org.label-schema.build-date="{{dockerBuildDate}}" \
org.opencontainers.image.licenses="{{license}}" \
org.opencontainers.image.revision="{{revision}}" \
org.opencontainers.image.source="https://github.com/opensearch-project/OpenSearch-Dashboards" \
org.opencontainers.image.title="OpenSearch-Dashboards" \
org.opencontainers.image.title="OpenSearch Dashboards" \
org.opencontainers.image.url="https://www.opensearch.org/" \
org.opencontainers.image.vendor="OpenSearch" \
org.opencontainers.image.version="{{version}}"

{{#ubi}}
LABEL name="OpenSearch-Dashboards" \
LABEL name="OpenSearch Dashboards" \
vendor="OpenSearch" \
version="{{version}}" \
release="1" \
summary="OpenSearch-Dashboards" \
summary="OpenSearch Dashboards" \
description="OpenSearch Dashboards for exploring and visualizing OpenSearch data"

RUN mkdir /licenses && \
Expand Down

0 comments on commit 68d71e4

Please sign in to comment.