4 files changed, 99 insertions, 0 deletions
diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2
new file mode 100644
index 000000000..030ae925d
--- /dev/null
+++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2
@@ -0,0 +1,37 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block opensearch_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }}
+
+{% block opensearch_version %}
+
+    {% if base_arch == 'x86_64' %}
+        {% set arch_os='x64' %}
+    {% elif base_arch == 'aarch64' %}
+        {% set arch_os='arm64' %}
+    {% endif %}
+
+ARG opensearch_version=2.3.0
+ARG opensearch_dashboards_url=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/${opensearch_version}/opensearch-dashboards-${opensearch_version}-linux-{{ arch_os }}.tar.gz
+{% endblock %}
+
+ARG OPENSEARCH_DASHBOARDS_HOME=/usr/share/opensearch-dashboards
+
+RUN mkdir -p $OPENSEARCH_DASHBOARDS_HOME && \
+    curl -o /tmp/opensearch-dashboards.tgz ${opensearch_dashboards_url} && \
+    tar -xzpf /tmp/opensearch-dashboards.tgz -C $OPENSEARCH_DASHBOARDS_HOME --strip-components=1 && \
+    rm /tmp/opensearch-dashboards.tgz
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start
+
+{% block opensearch_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER opensearch
diff --git a/docker/opensearch/opensearch-dashboards/extend_start.sh b/docker/opensearch/opensearch-dashboards/extend_start.sh
new file mode 100644
index 000000000..fa7872738
--- /dev/null
+++ b/docker/opensearch/opensearch-dashboards/extend_start.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/opensearch" ]]; then
+    mkdir -p /var/log/kolla/opensearch
+fi
+if [[ $(stat -c %a /var/log/kolla/opensearch) != "755" ]]; then
+    chmod 755 /var/log/kolla/opensearch
+fi
+
+export DASHBOARDS_HOME=/usr/share/opensearch-dashboards
+
+PLUGIN_LIST=$($DASHBOARDS_HOME/bin/opensearch-dashboards-plugin list)
+if [[ "${OPENSEARCH_DASHBOARDS_SECURITY_PLUGIN:-True}" == "False" ]]; then
+    if [[ ${PLUGIN_LIST} =~ "securityDashboards" ]]; then
+        $DASHBOARDS_HOME/bin/opensearch-dashboards-plugin remove securityDashboards
+    fi
+fi
diff --git a/docker/opensearch/opensearch/Dockerfile.j2 b/docker/opensearch/opensearch/Dockerfile.j2
new file mode 100644
index 000000000..be2925695
--- /dev/null
+++ b/docker/opensearch/opensearch/Dockerfile.j2
@@ -0,0 +1,37 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block opensearch_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }}
+
+{% block opensearch_version %}
+
+    {% if base_arch == 'x86_64' %}
+        {% set arch_os='x64' %}
+    {% elif base_arch == 'aarch64' %}
+        {% set arch_os='arm64' %}
+    {% endif %}
+
+ARG opensearch_version=2.3.0
+ARG opensearch_url=https://artifacts.opensearch.org/releases/bundle/opensearch/${opensearch_version}/opensearch-${opensearch_version}-linux-{{ arch_os }}.tar.gz
+{% endblock %}
+
+ARG OPENSEARCH_HOME=/usr/share/opensearch
+
+RUN curl -o /tmp/opensearch.tgz ${opensearch_url} && \
+    tar -xzpf /tmp/opensearch.tgz -C $OPENSEARCH_HOME --strip-components=1 && \
+    rm /tmp/opensearch.tgz && \
+    mkdir -p $OPENSEARCH_HOME/data && chown -R opensearch:opensearch $OPENSEARCH_HOME/data
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start
+
+{% block elasticsearch_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER opensearch
diff --git a/docker/opensearch/opensearch/extend_start.sh b/docker/opensearch/opensearch/extend_start.sh
new file mode 100644
index 000000000..5855b1be2
--- /dev/null
+++ b/docker/opensearch/opensearch/extend_start.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/opensearch" ]]; then
+    mkdir -p /var/log/kolla/opensearch
+fi
+if [[ $(stat -c %a /var/log/kolla/opensearch) != "755" ]]; then
+    chmod 755 /var/log/kolla/opensearch
+fi