From ff7a64155949954dfc3a57b6c927ad46bad2c494 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 20 May 2024 23:07:58 +0200 Subject: [PATCH] [elasticsearch] Update rendered example --- example/images/elasticsearch/Dockerfile | 2 +- example/prep.d/10-build-base-images.sh | 70 ++++++++++++------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/example/images/elasticsearch/Dockerfile b/example/images/elasticsearch/Dockerfile index 6327086..a7bdf28 100644 --- a/example/images/elasticsearch/Dockerfile +++ b/example/images/elasticsearch/Dockerfile @@ -20,7 +20,7 @@ RUN set -eux &&\ chown -R 9200:9200 /opt/elasticsearch/config &&\ chown -R 9200:9200 /opt/elasticsearch/.aws -FROM danielberteaud/java:17.24.5-1 +FROM danielberteaud/java:17.24.5-2 MAINTAINER Daniel Berteaud ENV PATH=/opt/elasticsearch/bin:$PATH \ diff --git a/example/prep.d/10-build-base-images.sh b/example/prep.d/10-build-base-images.sh index 8cd68e2..4f90d05 100755 --- a/example/prep.d/10-build-base-images.sh +++ b/example/prep.d/10-build-base-images.sh @@ -97,73 +97,73 @@ function build_elasticsearch8 { } function build_java11 { if [ "${IMAGE_JAVA11_AVAILABLE:-0}" = "1" ]; then - echo "Image danielberteaud/java:11.24.5-1 already available" + echo "Image danielberteaud/java:11.24.5-2 already available" return fi - if ! docker manifest inspect danielberteaud/java:11.24.5-1 > /dev/null 2>&1; then - echo "Building java:11.24.5-1" + if ! docker manifest inspect danielberteaud/java:11.24.5-2 > /dev/null 2>&1; then + echo "Building java:11.24.5-2" export BUILDKIT_PROGRESS=plain - docker build -t danielberteaud/java:11.24.5-1 -t danielberteaud/java11:latest -t danielberteaud/java:11 --build-arg=JAVA_VERSION=11 output/images/java &&\ - docker push danielberteaud/java:11.24.5-1 &&\ + docker build -t danielberteaud/java:11.24.5-2 -t danielberteaud/java11:latest -t danielberteaud/java:11 --build-arg=JAVA_VERSION=11 output/images/java &&\ + docker push danielberteaud/java:11.24.5-2 &&\ docker push danielberteaud/java11:latest &&\ docker push danielberteaud/java:11 &&\ - echo "danielberteaud/java:11.24.5-1 pushed to remote repo" + echo "danielberteaud/java:11.24.5-2 pushed to remote repo" else - echo "Image danielberteaud/java:11.24.5-1 already available" + echo "Image danielberteaud/java:11.24.5-2 already available" fi IMAGE_JAVA11_AVAILABLE=1 } function build_java17 { if [ "${IMAGE_JAVA17_AVAILABLE:-0}" = "1" ]; then - echo "Image danielberteaud/java:17.24.5-1 already available" + echo "Image danielberteaud/java:17.24.5-2 already available" return fi - if ! docker manifest inspect danielberteaud/java:17.24.5-1 > /dev/null 2>&1; then - echo "Building java:17.24.5-1" + if ! docker manifest inspect danielberteaud/java:17.24.5-2 > /dev/null 2>&1; then + echo "Building java:17.24.5-2" export BUILDKIT_PROGRESS=plain - docker build -t danielberteaud/java:17.24.5-1 -t danielberteaud/java17:latest -t danielberteaud/java:17 --build-arg=JAVA_VERSION=17 output/images/java &&\ - docker push danielberteaud/java:17.24.5-1 &&\ + docker build -t danielberteaud/java:17.24.5-2 -t danielberteaud/java17:latest -t danielberteaud/java:17 --build-arg=JAVA_VERSION=17 output/images/java &&\ + docker push danielberteaud/java:17.24.5-2 &&\ docker push danielberteaud/java17:latest &&\ docker push danielberteaud/java:17 &&\ - echo "danielberteaud/java:17.24.5-1 pushed to remote repo" + echo "danielberteaud/java:17.24.5-2 pushed to remote repo" else - echo "Image danielberteaud/java:17.24.5-1 already available" + echo "Image danielberteaud/java:17.24.5-2 already available" fi IMAGE_JAVA17_AVAILABLE=1 } function build_java21 { if [ "${IMAGE_JAVA21_AVAILABLE:-0}" = "1" ]; then - echo "Image danielberteaud/java:21.24.5-1 already available" + echo "Image danielberteaud/java:21.24.5-2 already available" return fi - if ! docker manifest inspect danielberteaud/java:21.24.5-1 > /dev/null 2>&1; then - echo "Building java:21.24.5-1" + if ! docker manifest inspect danielberteaud/java:21.24.5-2 > /dev/null 2>&1; then + echo "Building java:21.24.5-2" export BUILDKIT_PROGRESS=plain - docker build -t danielberteaud/java:21.24.5-1 -t danielberteaud/java21:latest -t danielberteaud/java:21 --build-arg=JAVA_VERSION=21 output/images/java &&\ - docker push danielberteaud/java:21.24.5-1 &&\ + docker build -t danielberteaud/java:21.24.5-2 -t danielberteaud/java21:latest -t danielberteaud/java:21 --build-arg=JAVA_VERSION=21 output/images/java &&\ + docker push danielberteaud/java:21.24.5-2 &&\ docker push danielberteaud/java21:latest &&\ docker push danielberteaud/java:21 &&\ - echo "danielberteaud/java:21.24.5-1 pushed to remote repo" + echo "danielberteaud/java:21.24.5-2 pushed to remote repo" else - echo "Image danielberteaud/java:21.24.5-1 already available" + echo "Image danielberteaud/java:21.24.5-2 already available" fi IMAGE_JAVA21_AVAILABLE=1 } function build_java8 { if [ "${IMAGE_JAVA8_AVAILABLE:-0}" = "1" ]; then - echo "Image danielberteaud/java:8.24.5-1 already available" + echo "Image danielberteaud/java:8.24.5-2 already available" return fi - if ! docker manifest inspect danielberteaud/java:8.24.5-1 > /dev/null 2>&1; then - echo "Building java:8.24.5-1" + if ! docker manifest inspect danielberteaud/java:8.24.5-2 > /dev/null 2>&1; then + echo "Building java:8.24.5-2" export BUILDKIT_PROGRESS=plain - docker build -t danielberteaud/java:8.24.5-1 -t danielberteaud/java8:latest -t danielberteaud/java:8 --build-arg=JAVA_VERSION=8 output/images/java &&\ - docker push danielberteaud/java:8.24.5-1 &&\ + docker build -t danielberteaud/java:8.24.5-2 -t danielberteaud/java8:latest -t danielberteaud/java:8 --build-arg=JAVA_VERSION=8 output/images/java &&\ + docker push danielberteaud/java:8.24.5-2 &&\ docker push danielberteaud/java8:latest &&\ docker push danielberteaud/java:8 &&\ - echo "danielberteaud/java:8.24.5-1 pushed to remote repo" + echo "danielberteaud/java:8.24.5-2 pushed to remote repo" else - echo "Image danielberteaud/java:8.24.5-1 already available" + echo "Image danielberteaud/java:8.24.5-2 already available" fi IMAGE_JAVA8_AVAILABLE=1 } @@ -382,18 +382,18 @@ function build_sqlite { } function build_valkey { if [ "${IMAGE_VALKEY_AVAILABLE:-0}" = "1" ]; then - echo "Image danielberteaud/valkey:24.5-1 already available" + echo "Image danielberteaud/valkey:24.5-5 already available" return fi - if ! docker manifest inspect danielberteaud/valkey:24.5-1 > /dev/null 2>&1; then - echo "Building valkey:24.5-1" + if ! docker manifest inspect danielberteaud/valkey:24.5-5 > /dev/null 2>&1; then + echo "Building valkey:24.5-5" export BUILDKIT_PROGRESS=plain - docker build -t danielberteaud/valkey:24.5-1 -t danielberteaud/valkey:latest output/images/valkey &&\ - docker push danielberteaud/valkey:24.5-1 &&\ + docker build -t danielberteaud/valkey:24.5-5 -t danielberteaud/valkey:latest output/images/valkey &&\ + docker push danielberteaud/valkey:24.5-5 &&\ docker push danielberteaud/valkey:latest &&\ - echo "danielberteaud/valkey:24.5-1 pushed to remote repo" + echo "danielberteaud/valkey:24.5-5 pushed to remote repo" else - echo "Image danielberteaud/valkey:24.5-1 already available" + echo "Image danielberteaud/valkey:24.5-5 already available" fi IMAGE_VALKEY_AVAILABLE=1 }