Update OpenSearch version

Author: ceh

install/Dockerfile.opensearchknn

@@ -1,13 +1,14 @@
 # Warning! Do not use this config in production! 
 # This is only for testing and security has been turned off.
 
-FROM ann-benchmarks
+FROM ann-benchmarks AS builder
 
-WORKDIR /home/app
+ARG OPENSEARCH_VERSION=2.6.0
+
+WORKDIR /tmp
 
-# Install OpenSearch following instructions from https://opensearch.org/docs/opensearch/install/tar/
-# and https://opensearch.org/docs/opensearch/install/important-settings/
-RUN apt-get install tmux wget gosu -y
+# Download OpenSearch to intermediate builder.
+RUN apt-get -y install curl
 
 RUN set -eux ; \
     ARCH=''; \
@@ -16,12 +17,23 @@ RUN set -eux ; \
         x86_64)  ARCH='x64' ;; \
         *) echo >&2 ; echo >&2 "Unsupported architecture $(arch)" ; echo >&2 ; exit 1 ;; \
     esac ; \
-    wget https://artifacts.opensearch.org/releases/bundle/opensearch/1.0.0/opensearch-1.0.0-linux-$ARCH.tar.gz; \
-    tar -zxf opensearch-1.0.0-linux-$ARCH.tar.gz; \
-    rm -r opensearch-1.0.0-linux-$ARCH.tar.gz opensearch-1.0.0/plugins/opensearch-security;
+    curl -OsS https://artifacts.opensearch.org/releases/bundle/opensearch/${OPENSEARCH_VERSION}/opensearch-${OPENSEARCH_VERSION}-linux-$ARCH.tar.gz; \
+    tar -zxf opensearch-${OPENSEARCH_VERSION}-linux-$ARCH.tar.gz; \
+    mv opensearch-${OPENSEARCH_VERSION} opensearch; \
+    rm -r opensearch-${OPENSEARCH_VERSION}-linux-$ARCH.tar.gz opensearch/plugins/opensearch-security;
+
+# Install OpenSearch in final image:
+#  - https://opensearch.org/docs/latest/install-and-configure/install-opensearch/tar/
+FROM ann-benchmarks
+
+WORKDIR /home/app
+
+RUN apt-get -y install curl tmux gosu
+
+COPY --from=builder /tmp/opensearch /home/app/opensearch
+RUN chmod -R 777 opensearch
 
-RUN chmod -R 777 opensearch-1.0.0
-RUN sysctl -w vm.max_map_count=262144
+RUN echo "vm.max_map_count=262144" >> /etc/sysctl.conf
 
 RUN python3 -m pip install --upgrade elasticsearch==7.13.4 tqdm
 
@@ -33,7 +45,7 @@ node.roles: [ data, master ]\n\
 node.processors: 1\n\
 thread_pool.write.size: 1\n\
 thread_pool.search.size: 1\n\
-thread_pool.search.queue_size: 1' > opensearch-1.0.0/config/opensearch.yml
+thread_pool.search.queue_size: 1' > opensearch/config/opensearch.yml
 
 RUN echo '\
 -Xms3G\n\
@@ -42,11 +54,11 @@ RUN echo '\
 -XX:+HeapDumpOnOutOfMemoryError\n\
 -XX:HeapDumpPath=data\n\
 -XX:ErrorFile=logs/hs_err_pid%p.log\n\
--Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m' > opensearch-1.0.0/config/jvm.options
+-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m' > opensearch/config/jvm.options
 
 # Custom entrypoint that also starts the OpenSearch server.
 RUN useradd -m opensearch
-RUN echo 'tmux new-session -d -s opensearch """exec gosu opensearch "./opensearch-1.0.0/opensearch-tar-install.sh""""' > entrypoint.sh
+RUN echo 'tmux new-session -d -s opensearch """exec gosu opensearch "./opensearch/opensearch-tar-install.sh""""' > entrypoint.sh
 RUN echo 'python3 -u run_algorithm.py "$@"' >> entrypoint.sh
 
 ENTRYPOINT ["/bin/bash", "/home/app/entrypoint.sh"]