Skip to content

Commit

Permalink
update OS dockerfile
Browse files Browse the repository at this point in the history
Signed-off-by: kalyan <[email protected]>
  • Loading branch information
rawwar committed Nov 5, 2023
1 parent 76fcd84 commit 50bacd4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 4 additions & 3 deletions .ci/opensearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
ARG OPENSEARCH_VERSION=latest
FROM opensearchproject/opensearch:$OPENSEARCH_VERSION

# OPENSEARCH_VERSION can't be used because its outside build scope.
ARG OS_VERSION=latest
# OPENSEARCH_VERSION needs to be redefined as any arg before FROM is outside build scope.
ARG OPENSEARCH_VERSION=latest
ARG opensearch_path=/usr/share/opensearch
ARG opensearch_yml=$opensearch_path/config/opensearch.yml

ARG SECURE_INTEGRATION
RUN echo "SECURE_INTEGRATION is set to: $SECURE_INTEGRATION"
RUN echo "plugins.ml_commons.only_run_on_ml_node: false" >> $opensearch_yml;
RUN echo "plugins.ml_commons.native_memory_threshold: 100" >> $opensearch_yml;
RUN if [ "$OS_VERSION" == "2.11.0" ] ; then echo "plugins.ml_commons.model_access_control_enabled: true" >> $opensearch_yml; fi
RUN if [ "$OPENSEARCH_VERSION" == "2.11.0" ] ; then echo "plugins.ml_commons.model_access_control_enabled: true" >> $opensearch_yml; fi
RUN if [ "$SECURE_INTEGRATION" != "true" ] ; then echo "plugins.security.disabled: true" >> $opensearch_yml; fi
RUN cat /usr/share/opensearch/config/opensearch.yml
1 change: 0 additions & 1 deletion .ci/run-opensearch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ END
--file=.ci/$CLUSTER/Dockerfile \
--build-arg SECURE_INTEGRATION=$SECURE_INTEGRATION \
--build-arg OPENSEARCH_VERSION=$OPENSEARCH_VERSION \
--build-arg OS_VERSION=$OPENSEARCH_VERSION \
--tag=$CLUSTER_TAG \
.
else
Expand Down

0 comments on commit 50bacd4

Please sign in to comment.