Merge pull request #9065 from pvliss/fix-elastic-docker-for-azure-ci

Fix elastic docker compose error for azure ci
jhipster · Jan 15, 2019 · 7509cca · 7509cca
2 parents 36f61b2 + 1b0765e
commit 7509cca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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