nomad/elasticsearch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[elasticsearch] Update rendered example

Browse Source
This commit is contained in:
Daniel Berteaud 2024-05-20 23:07:58 +02:00
parent 7a99586b53
commit ff7a641559
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/images/elasticsearch/Dockerfile
View File

@ -20,7 +20,7 @@ RUN set -eux &&\
chown -R 9200:9200 /opt/elasticsearch/config &&\ chown -R 9200:9200 /opt/elasticsearch/config &&\
chown -R 9200:9200 /opt/elasticsearch/.aws chown -R 9200:9200 /opt/elasticsearch/.aws
FROM danielberteaud/java:17.24.5-1 FROM danielberteaud/java:17.24.5-2
MAINTAINER Daniel Berteaud <dbd@ehtrace.com> MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ENV PATH=/opt/elasticsearch/bin:$PATH \ ENV PATH=/opt/elasticsearch/bin:$PATH \

70
example/prep.d/10-build-base-images.sh
View File

@ -97,73 +97,73 @@ function build_elasticsearch8 {
} }
function build_java11 { function build_java11 {
if [ "${IMAGE_JAVA11_AVAILABLE:-0}" = "1" ]; then 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 return
fi fi
if ! docker manifest inspect danielberteaud/java:11.24.5-1 > /dev/null 2>&1; then if ! docker manifest inspect danielberteaud/java:11.24.5-2 > /dev/null 2>&1; then
echo "Building java:11.24.5-1" echo "Building java:11.24.5-2"
export BUILDKIT_PROGRESS=plain 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 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-1 &&\ docker push danielberteaud/java:11.24.5-2 &&\
docker push danielberteaud/java11:latest &&\ docker push danielberteaud/java11:latest &&\
docker push danielberteaud/java:11 &&\ 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 else
echo "Image danielberteaud/java:11.24.5-1 already available" echo "Image danielberteaud/java:11.24.5-2 already available"
fi fi
IMAGE_JAVA11_AVAILABLE=1 IMAGE_JAVA11_AVAILABLE=1
} }
function build_java17 { function build_java17 {
if [ "${IMAGE_JAVA17_AVAILABLE:-0}" = "1" ]; then 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 return
fi fi
if ! docker manifest inspect danielberteaud/java:17.24.5-1 > /dev/null 2>&1; then if ! docker manifest inspect danielberteaud/java:17.24.5-2 > /dev/null 2>&1; then
echo "Building java:17.24.5-1" echo "Building java:17.24.5-2"
export BUILDKIT_PROGRESS=plain 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 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-1 &&\ docker push danielberteaud/java:17.24.5-2 &&\
docker push danielberteaud/java17:latest &&\ docker push danielberteaud/java17:latest &&\
docker push danielberteaud/java:17 &&\ 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 else
echo "Image danielberteaud/java:17.24.5-1 already available" echo "Image danielberteaud/java:17.24.5-2 already available"
fi fi
IMAGE_JAVA17_AVAILABLE=1 IMAGE_JAVA17_AVAILABLE=1
} }
function build_java21 { function build_java21 {
if [ "${IMAGE_JAVA21_AVAILABLE:-0}" = "1" ]; then 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 return
fi fi
if ! docker manifest inspect danielberteaud/java:21.24.5-1 > /dev/null 2>&1; then if ! docker manifest inspect danielberteaud/java:21.24.5-2 > /dev/null 2>&1; then
echo "Building java:21.24.5-1" echo "Building java:21.24.5-2"
export BUILDKIT_PROGRESS=plain 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 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-1 &&\ docker push danielberteaud/java:21.24.5-2 &&\
docker push danielberteaud/java21:latest &&\ docker push danielberteaud/java21:latest &&\
docker push danielberteaud/java:21 &&\ 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 else
echo "Image danielberteaud/java:21.24.5-1 already available" echo "Image danielberteaud/java:21.24.5-2 already available"
fi fi
IMAGE_JAVA21_AVAILABLE=1 IMAGE_JAVA21_AVAILABLE=1
} }
function build_java8 { function build_java8 {
if [ "${IMAGE_JAVA8_AVAILABLE:-0}" = "1" ]; then 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 return
fi fi
if ! docker manifest inspect danielberteaud/java:8.24.5-1 > /dev/null 2>&1; then if ! docker manifest inspect danielberteaud/java:8.24.5-2 > /dev/null 2>&1; then
echo "Building java:8.24.5-1" echo "Building java:8.24.5-2"
export BUILDKIT_PROGRESS=plain 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 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-1 &&\ docker push danielberteaud/java:8.24.5-2 &&\
docker push danielberteaud/java8:latest &&\ docker push danielberteaud/java8:latest &&\
docker push danielberteaud/java:8 &&\ 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 else
echo "Image danielberteaud/java:8.24.5-1 already available" echo "Image danielberteaud/java:8.24.5-2 already available"
fi fi
IMAGE_JAVA8_AVAILABLE=1 IMAGE_JAVA8_AVAILABLE=1
} }
@ -382,18 +382,18 @@ function build_sqlite {
} }
function build_valkey { function build_valkey {
if [ "${IMAGE_VALKEY_AVAILABLE:-0}" = "1" ]; then 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 return
fi fi
if ! docker manifest inspect danielberteaud/valkey:24.5-1 > /dev/null 2>&1; then if ! docker manifest inspect danielberteaud/valkey:24.5-5 > /dev/null 2>&1; then
echo "Building valkey:24.5-1" echo "Building valkey:24.5-5"
export BUILDKIT_PROGRESS=plain export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/valkey:24.5-1 -t danielberteaud/valkey:latest output/images/valkey &&\ docker build -t danielberteaud/valkey:24.5-5 -t danielberteaud/valkey:latest output/images/valkey &&\
docker push danielberteaud/valkey:24.5-1 &&\ docker push danielberteaud/valkey:24.5-5 &&\
docker push danielberteaud/valkey:latest &&\ 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 else
echo "Image danielberteaud/valkey:24.5-1 already available" echo "Image danielberteaud/valkey:24.5-5 already available"
fi fi
IMAGE_VALKEY_AVAILABLE=1 IMAGE_VALKEY_AVAILABLE=1
} }