diff --git a/example/elasticsearch.nomad.hcl b/example/elasticsearch.nomad.hcl index 0c81db4..aebf610 100644 --- a/example/elasticsearch.nomad.hcl +++ b/example/elasticsearch.nomad.hcl @@ -5,8 +5,6 @@ job "elasticsearch" { region = "global" - - group "server" { diff --git a/example/prep.d/10-build-base-images.sh b/example/prep.d/10-build-base-images.sh index 7c25f91..9b5c5d8 100755 --- a/example/prep.d/10-build-base-images.sh +++ b/example/prep.d/10-build-base-images.sh @@ -61,19 +61,19 @@ function build_alpine { } function build_elasticsearch7 { if [ "${IMAGE_ELASTICSEARCH7_AVAILABLE:-0}" = "1" ]; then - echo "Image danielberteaud/elasticsearch:7.17.19-1 already available" + echo "Image danielberteaud/elasticsearch:7.17.20-1 already available" return fi - if ! docker manifest inspect danielberteaud/elasticsearch:7.17.19-1 > /dev/null 2>&1; then - echo "Building elasticsearch:7.17.19-1" + if ! docker manifest inspect danielberteaud/elasticsearch:7.17.20-1 > /dev/null 2>&1; then + echo "Building elasticsearch:7.17.20-1" export BUILDKIT_PROGRESS=plain - docker build -t danielberteaud/elasticsearch:7.17.19-1 -t danielberteaud/elasticsearch:7 -t danielberteaud/elasticsearch7:latest --build-arg=ES_VERSION=7.17.19 output/images/elasticsearch &&\ - docker push danielberteaud/elasticsearch:7.17.19-1 &&\ + docker build -t danielberteaud/elasticsearch:7.17.20-1 -t danielberteaud/elasticsearch:7 -t danielberteaud/elasticsearch7:latest --build-arg=ES_VERSION=7.17.20 output/images/elasticsearch &&\ + docker push danielberteaud/elasticsearch:7.17.20-1 &&\ docker push danielberteaud/elasticsearch:7 &&\ docker push danielberteaud/elasticsearch7:latest &&\ - echo "danielberteaud/elasticsearch:7.17.19-1 pushed to remote repo" + echo "danielberteaud/elasticsearch:7.17.20-1 pushed to remote repo" else - echo "Image danielberteaud/elasticsearch:7.17.19-1 already available" + echo "Image danielberteaud/elasticsearch:7.17.20-1 already available" fi IMAGE_ELASTICSEARCH7_AVAILABLE=1 } diff --git a/variables.yml b/variables.yml index 3ef9bdf..7b2aeda 100644 --- a/variables.yml +++ b/variables.yml @@ -130,7 +130,7 @@ docker: elasticsearch7: image: elasticsearch:[[ .docker.base_images.elasticsearch7.build_args.ES_VERSION ]]-1 build_args: - ES_VERSION: 7.17.19 + ES_VERSION: 7.17.20 tags: - elasticsearch:7 - elasticsearch7:latest