Merge pull request #1886 from amazeeio/1877-add-es-curl-baseimages

Moved es-curl to elasticsearch base images

images/elasticsearch/Dockerfile6

@@ -47,6 +47,9 @@ ENV ES_JAVA_OPTS="-Xms200m -Xmx200m" \
     DISCOVERY_ZEN_MINIMUM_MASTER_NODES=1 \
     NODE_MASTER=true
 
+# Copy es-curl wrapper
+COPY es-curl /usr/share/elasticsearch/bin/es-curl
+
 VOLUME [ "/usr/share/elasticsearch/data" ]
 
 ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.bash"]

images/elasticsearch/Dockerfile7

@@ -59,6 +59,9 @@ ENV ES_JAVA_OPTS="-Xms400m -Xmx400m" \
     CLUSTER_REMOTE_CONNECT=true \
     EXTRA_OPTS=""
 
+# Copy es-curl wrapper
+COPY es-curl /usr/share/elasticsearch/bin/es-curl
+
 
 VOLUME [ "/usr/share/elasticsearch/data" ]
 

images/elasticsearch/es-curl

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ -z "$1" ] || [ -z "$2" ]; then
+  echo "Usage: es-curl.sh VERB COMMAND"
+  exit 1
+fi
+
+VERB=$1
+COMMAND=$2
+
+shift
+shift
+
+if [ "$LOGSDB_ADMIN_PASSWORD" ]; then
+  curl -X $VERB -k -u "admin:$LOGSDB_ADMIN_PASSWORD" "http://localhost:9200/$COMMAND" -H 'Content-Type: application/json' "$@"
+else
+  curl -X $VERB -k "http://localhost:9200/$COMMAND" -H 'Content-Type: application/json' "$@"
+fi

services/logs-db/Dockerfile

@@ -31,6 +31,5 @@ RUN fix-permissions plugins/opendistro_security/securityconfig
 COPY entrypoints/80-keycloak-url.bash /lagoon/entrypoints/
 
 COPY start.sh /start.sh
-COPY es-curl /usr/share/elasticsearch/bin/es-curl
 
 CMD ["/start.sh"]