Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Upgrade OpenSearch base image to 2.17.1 #3

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Upgrade OpenSearch base image to 2.17.1 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
mvn clean package
- name: Archive build output
run: |
mv opensearch-filter-plugin/target/opensearch-filter-plugin-2.11.1.0.zip docker/opensearch-filter-plugin-2.11.1.0.zip
mv opensearch-filter-plugin/target/opensearch-filter-plugin-2.17.1.0.zip docker/opensearch-filter-plugin-2.17.1.0.zip
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
Expand Down
6 changes: 3 additions & 3 deletions demo/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2.1'
services:
opensearch-1:
image: opensearch:2.11.1
image: opensearch:2.17.1
ports:
- 9200:9200
environment:
Expand Down Expand Up @@ -39,7 +39,7 @@ services:
timeout: 10s
retries: 5
opensearch-2:
image: opensearch:2.11.1
image: opensearch:2.17.1
volumes:
- data2:/usr/share/opensearch/data
- ./snapshots:/usr/share/opensearch/snapshots
Expand Down Expand Up @@ -75,7 +75,7 @@ services:
timeout: 10s
retries: 5
opensearch-3:
image: opensearch:2.11.1
image: opensearch:2.17.1
volumes:
- data3:/usr/share/opensearch/data
- ./snapshots:/usr/share/opensearch/snapshots
Expand Down
20 changes: 13 additions & 7 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM opensearchproject/opensearch:2.11.1
FROM opensearchproject/opensearch:2.17.1

USER 0

Expand All @@ -23,12 +23,18 @@ RUN yum install --nogpgcheck -y jq \
RUN yum update --nogpgcheck --assumeyes --skip-broken

RUN echo "Download OpenSearch plugins..." \
&& curl --create-dirs -s "https://artifacts.opensearch.org/releases/plugins/repository-s3/2.11.1/repository-s3-2.11.1.zip" \
-o ${OPENSEARCH_HOME}/dist/repository-s3/repository-s3-2.11.1.zip \
&& curl --create-dirs -s "https://artifacts.opensearch.org/releases/plugins/repository-gcs/2.11.1/repository-gcs-2.11.1.zip" \
-o ${OPENSEARCH_HOME}/dist/repository-gcs/repository-gcs-2.11.1.zip

COPY docker/opensearch-filter-plugin-2.11.1.0.zip ${OPENSEARCH_HOME}/dist/opensearch-filter-plugin/
&& curl --create-dirs -s "https://artifacts.opensearch.org/releases/plugins/repository-s3/2.17.1/repository-s3-2.17.1.zip" \
-o ${OPENSEARCH_HOME}/dist/repository-s3/repository-s3-2.17.1.zip \
&& curl --create-dirs -s "https://artifacts.opensearch.org/releases/plugins/repository-gcs/2.17.1/repository-gcs-2.17.1.zip" \
-o ${OPENSEARCH_HOME}/dist/repository-gcs/repository-gcs-2.17.1.zip \
&& if [ -f ${OPENSEARCH_HOME}/dist/repository-s3/repository-s3-2.17.1.zip ] && [ -f ${OPENSEARCH_HOME}/dist/repository-gcs/repository-gcs-2.17.1.zip ]; then \
echo "Plugins downloaded successfully."; \
else \
echo "Plugin download failed"; \
exit 1; \
fi

COPY docker/opensearch-filter-plugin-2.17.1.0.zip ${OPENSEARCH_HOME}/dist/opensearch-filter-plugin/

# Adapt grants
RUN set -x \
Expand Down
6 changes: 3 additions & 3 deletions docker/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
set -e

${OPENSEARCH_HOME}/bin/opensearch-plugin install \
--batch --verbose "file://${OPENSEARCH_HOME}/dist/repository-s3/repository-s3-2.11.1.zip"
--batch --verbose "file://${OPENSEARCH_HOME}/dist/repository-s3/repository-s3-2.17.1.zip"
${OPENSEARCH_HOME}/bin/opensearch-plugin install \
--batch --verbose "file://${OPENSEARCH_HOME}/dist/repository-gcs/repository-gcs-2.11.1.zip"
--batch --verbose "file://${OPENSEARCH_HOME}/dist/repository-gcs/repository-gcs-2.17.1.zip"
${OPENSEARCH_HOME}/bin/opensearch-plugin install \
--batch --verbose "file://${OPENSEARCH_HOME}/dist/opensearch-filter-plugin/opensearch-filter-plugin-2.11.1.0.zip"
--batch --verbose "file://${OPENSEARCH_HOME}/dist/opensearch-filter-plugin/opensearch-filter-plugin-2.17.1.0.zip"
rm -rf ${OPENSEARCH_HOME}/dist

if [[ -n "$OPENSEARCH_SECURITY_CONFIG_PATH" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions opensearch-filter-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<groupId>org.qubership</groupId>
<artifactId>opensearch-filter-plugin</artifactId>
<version>2.11.1.0</version>
<version>2.17.1.0</version>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>11</jdk.version>
<opensearch.version>2.11.1</opensearch.version>
<opensearch.version>2.17.1</opensearch.version>
<jackson.version>2.15.2</jackson.version>
</properties>

Expand Down
Loading