-
Notifications
You must be signed in to change notification settings - Fork 339
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #211 from cisagov/v6.1.0_merge_cisagov
v6.1.0 development
- Loading branch information
Showing
228 changed files
with
7,103 additions
and
10,477 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
# this file exists solely for the purpose of being updated and seen by github to trigger a commit build action | ||
19 | ||
20 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,10 +14,10 @@ ENV PGROUP "dashboarder" | |
|
||
ENV TERM xterm | ||
|
||
ARG OPENSEARCH_VERSION="1.3.2" | ||
ARG OPENSEARCH_VERSION="2.1.0" | ||
ENV OPENSEARCH_VERSION $OPENSEARCH_VERSION | ||
|
||
ARG OPENSEARCH_DASHBOARDS_VERSION="1.3.2" | ||
ARG OPENSEARCH_DASHBOARDS_VERSION="2.1.0" | ||
ENV OPENSEARCH_DASHBOARDS_VERSION $OPENSEARCH_DASHBOARDS_VERSION | ||
|
||
# base system dependencies for checking out and building plugins | ||
|
@@ -59,7 +59,7 @@ RUN git clone --single-branch --depth=1 --recurse-submodules --shallow-submodule | |
|
||
RUN eval "$(nodenv init -)" && \ | ||
mkdir -p /usr/share/opensearch-dashboards/plugins && \ | ||
git clone --depth 1 --recurse-submodules --shallow-submodules --single-branch https://github.com/mmguero-dev/osd_sankey_vis.git /usr/share/opensearch-dashboards/plugins/sankey_vis && \ | ||
git clone --depth 1 --recurse-submodules --shallow-submodules --single-branch --branch opensearch-v2-dashboards-compatibility https://github.com/mmguero-dev/osd_sankey_vis.git /usr/share/opensearch-dashboards/plugins/sankey_vis && \ | ||
cd /usr/share/opensearch-dashboards/plugins/sankey_vis && \ | ||
yarn osd bootstrap && \ | ||
yarn install && \ | ||
|
@@ -68,7 +68,7 @@ RUN eval "$(nodenv init -)" && \ | |
|
||
# runtime ################################################################## | ||
|
||
FROM opensearchproject/opensearch-dashboards:1.3.2 | ||
FROM opensearchproject/opensearch-dashboards:2.1.0 | ||
|
||
LABEL maintainer="[email protected]" | ||
LABEL org.opencontainers.image.authors='[email protected]' | ||
|
@@ -128,6 +128,8 @@ ADD shared/bin/docker-uid-gid-setup.sh /usr/local/bin/ | |
# to specify the entries in the opensearch_dashboards.yml such that they are valid BOTH from the | ||
# internal opensearch code validating them AND the web browser retrieving them. So we're going scorched earth instead. | ||
ADD docs/images/logo/malcolm_logo.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/default_branding/opensearch_logo.svg | ||
ADD docs/images/logo/malcolm_logo.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/default_branding/opensearch_logo_dark_mode.svg | ||
ADD docs/images/logo/malcolm_logo.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/default_branding/opensearch_logo_default_mode.svg | ||
ADD docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/default_branding/opensearch_mark_dark_mode.svg | ||
ADD docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/default_branding/opensearch_mark_default_mode.svg | ||
ADD docs/images/favicon/favicon.ico /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/favicon.ico | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM opensearchproject/opensearch:1.3.2 | ||
FROM opensearchproject/opensearch:2.1.0 | ||
|
||
# Copyright (c) 2022 Battelle Energy Alliance, LLC. All rights reserved. | ||
LABEL maintainer="[email protected]" | ||
|
@@ -37,7 +37,7 @@ RUN yum install -y openssl util-linux procps && \ | |
yum upgrade -y && \ | ||
/usr/share/opensearch/bin/opensearch-plugin remove opensearch-security --purge && \ | ||
/usr/share/opensearch/bin/opensearch-plugin remove opensearch-performance-analyzer --purge && \ | ||
echo -e 'cluster.name: "docker-cluster"\nnetwork.host: 0.0.0.0\ncompatibility.override_main_response_version: true\nbootstrap.memory_lock: true' > /usr/share/opensearch/config/opensearch.yml && \ | ||
echo -e 'cluster.name: "docker-cluster"\nnetwork.host: 0.0.0.0\nbootstrap.memory_lock: true' > /usr/share/opensearch/config/opensearch.yml && \ | ||
sed -i "s/#[[:space:]]*\([0-9]*-[0-9]*:-XX:-\(UseConcMarkSweepGC\|UseCMSInitiatingOccupancyOnly\)\)/\1/" /usr/share/opensearch/config/jvm.options && \ | ||
sed -i "s/^[0-9][0-9]*\(-:-XX:\(+UseG1GC\|G1ReservePercent\|InitiatingHeapOccupancyPercent\)\)/$($OPENSEARCH_JAVA_HOME/bin/java -version 2>&1 | grep version | awk '{print $3}' | tr -d '\"' | cut -d. -f1)\1/" /usr/share/opensearch/config/jvm.options && \ | ||
mkdir -p /usr/share/opensearch/ca-trust && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.