Merge branch 'master' into master_edit_keyword

README.md

@@ -204,4 +204,4 @@ This method also checks for the strings “none” and “unknown” which have
 Wildbook started as a collaborative software platform for globally-coordinated whale shark (Rhincodon typus ) research as deployed in the Wildbook for Whale Sharks (now part of http://www.sharkbook.ai). After many requests to use our software outside of whale shark research, it is now an open source, community-maintained standard for mark-recapture studies.
 
 
-Wildbook is a registered trademark of [Conservation X Labs](https://conservationxlabs.com/), a 501(c)(3) non-profit organization, and is supported by the [Wild Me](https://wildme.org) team.
+Wildbook is a trademark of [Conservation X Labs](https://conservationxlabs.com/), a 501(c)(3) non-profit organization, and is supported by the [Wild Me](https://wildme.org) team.

devops/README.md

@@ -15,6 +15,7 @@ Presently, this deployment does not start a local WBIA (image analysis) docker c
 
 ### Setup and running
 
+1. `sudo sysctl -w vm.max_map_count=262144` (this only needs to be run once on your system)
 1. In this folder, create a `.env` file and copy the contents of `_env.template` to it. By default, no changes should be needed, but you can edit this new file.
 1. In your terminal, create your base directory (value of `WILDBOOK_BASE_DIR`) and the required subdirectories. The default is `~/wildbook-dev/`):
 	```

devops/development/_env.template

@@ -15,6 +15,7 @@ POSTGRES_PASSWORD=development
 PGADMIN_DEFAULT_EMAIL=dev@example.com
 PGADMIN_DEFAULT_PASSWORD=development
 
+OPENSEARCH_INITIAL_ADMIN_PASSWORD=D3v3l0p-ment
 
 WILDBOOK_DB_NAME=wildbook
 WILDBOOK_DB_USER=wildbook

devops/development/docker-compose.yml

@@ -62,6 +62,39 @@ services:
       # JAVA_OPTS from old-world wildbook, which gives us 4G heap memory
       JAVA_OPTS: "-Djava.awt.headless=true -Xms4096m -Xmx4096m"
 
+  opensearch:
+    image: opensearchproject/opensearch:latest
+    healthcheck:
+      test: ["CMD-SHELL", "curl --silent --fail 127.0.0.1:9200/_cluster/health || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 60
+    labels:
+      - autoheal=true
+    volumes:
+      - opensearch-var1:/usr/share/opensearch/data
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    networks:
+      - intranet
+    ports:
+      # development exposure, not exposed in production
+      - 9200:9200
+      - 9300:9300
+    environment:
+      - plugins.security.disabled=true
+      - node.name=opensearch
+      #- discovery.seed_hosts=elasticsearch2,elasticsearch3
+      #- cluster.initial_master_nodes=elasticsearch,elasticsearch2,elasticsearch3
+      #- discovery.seed_hosts=opensearch2
+      - cluster.initial_master_nodes=opensearch
+      - bootstrap.memory_lock=true
+      - cluster.routing.allocation.disk.threshold_enabled=${ES_THRESHOLD:-true}
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - "OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD}"
+
   autoheal:
     image: willfarrell/autoheal
     volumes:
@@ -79,3 +112,5 @@ networks:
 volumes:
   db-pgdata-var:
   wildbook-var:
+  opensearch-var1:
+  opensearch-var2:

src/main/resources/bundles/contexts.properties

@@ -1,6 +1,6 @@
 
 #project-related variables
-application.version=6.0.0-EXPERIMENTAL
+application.version=${pom.version}
 defaultContext = context0