From e0df187dcc0a492768d29b8b2a253dd5a9876f09 Mon Sep 17 00:00:00 2001 From: Panayiotis Vlissidis Date: Tue, 15 Jan 2019 14:09:00 +0200 Subject: [PATCH 1/2] fix failing docker compose for elastic - do NOT comment out the environment group from elasticsearch.yml - update docker-compose format version to 2.2 - enclosed discovery.type=single-node within double quotes --- .../server/templates/src/main/docker/elasticsearch.yml.ejs | 4 ++-- test-integration/scripts/20-no-memory-limit-elasticsearch.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/server/templates/src/main/docker/elasticsearch.yml.ejs b/generators/server/templates/src/main/docker/elasticsearch.yml.ejs index c0a0c575a853..1bc64de19bca 100644 --- a/generators/server/templates/src/main/docker/elasticsearch.yml.ejs +++ b/generators/server/templates/src/main/docker/elasticsearch.yml.ejs @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. -%> -version: '2' +version: '2.2' services: <%= baseName.toLowerCase() %>-elasticsearch: image: <%= DOCKER_ELASTICSEARCH %> @@ -27,4 +27,4 @@ services: - 9300:9300 environment: - "ES_JAVA_OPTS=-Xms1024m -Xmx1024m" - - discovery.type=single-node + - "discovery.type=single-node" diff --git a/test-integration/scripts/20-no-memory-limit-elasticsearch.sh b/test-integration/scripts/20-no-memory-limit-elasticsearch.sh index 592831da1859..2742e5da3849 100755 --- a/test-integration/scripts/20-no-memory-limit-elasticsearch.sh +++ b/test-integration/scripts/20-no-memory-limit-elasticsearch.sh @@ -5,7 +5,7 @@ source $(dirname $0)/00-init-env.sh cd "$JHI_FOLDER_APP" if [ -a src/main/docker/elasticsearch.yml ]; then - sed -i -e 's/ environment:/ # environment:/1;' src/main/docker/elasticsearch.yml + #sed -i -e 's/ environment:/ # environment:/1;' src/main/docker/elasticsearch.yml sed -i -e 's/ - \"ES_JAVA_OPTS=-Xms1024m -Xmx1024m\"/ # - \"ES_JAVA_OPTS=-Xms1024m -Xmx1024m\"/1;' src/main/docker/elasticsearch.yml cat src/main/docker/elasticsearch.yml fi From 1b0765ecb9d4892fcedba5a1679bcf21dd4aed65 Mon Sep 17 00:00:00 2001 From: Panayiotis Vlissidis Date: Tue, 15 Jan 2019 17:02:21 +0200 Subject: [PATCH 2/2] fix failing docker compose for elastic - removed commented out line --- test-integration/scripts/20-no-memory-limit-elasticsearch.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/test-integration/scripts/20-no-memory-limit-elasticsearch.sh b/test-integration/scripts/20-no-memory-limit-elasticsearch.sh index 2742e5da3849..e7956d0e76c0 100755 --- a/test-integration/scripts/20-no-memory-limit-elasticsearch.sh +++ b/test-integration/scripts/20-no-memory-limit-elasticsearch.sh @@ -5,7 +5,6 @@ source $(dirname $0)/00-init-env.sh cd "$JHI_FOLDER_APP" if [ -a src/main/docker/elasticsearch.yml ]; then - #sed -i -e 's/ environment:/ # environment:/1;' src/main/docker/elasticsearch.yml sed -i -e 's/ - \"ES_JAVA_OPTS=-Xms1024m -Xmx1024m\"/ # - \"ES_JAVA_OPTS=-Xms1024m -Xmx1024m\"/1;' src/main/docker/elasticsearch.yml cat src/main/docker/elasticsearch.yml fi