diff --git a/example/base_images.nomad.hcl b/example/base_images.nomad.hcl index 885b233..556c59a 100644 --- a/example/base_images.nomad.hcl +++ b/example/base_images.nomad.hcl @@ -34,25 +34,25 @@ job "base_images" { task "java11" { driver = "docker" config { - image = "danielberteaud/java:11.24.3-2" + image = "danielberteaud/java:11.24.3-3" } } task "java17" { driver = "docker" config { - image = "danielberteaud/java:17.24.3-2" + image = "danielberteaud/java:17.24.3-3" } } task "java21" { driver = "docker" config { - image = "danielberteaud/java:21.24.3-2" + image = "danielberteaud/java:21.24.3-3" } } task "java8" { driver = "docker" config { - image = "danielberteaud/java:8.24.3-2" + image = "danielberteaud/java:8.24.3-3" } } task "mariadb" { diff --git a/example/images/java/root/entrypoint.d/30-java.env b/example/images/java/root/entrypoint.d/30-java.env index 6501b57..841df42 100644 --- a/example/images/java/root/entrypoint.d/30-java.env +++ b/example/images/java/root/entrypoint.d/30-java.env @@ -13,8 +13,8 @@ get_max_mem(){ else echo $(($(cat /sys/fs/cgroup/memory.max)/1024/1024)) fi - elif [ -e /sys/fs/cgroup/memory/memory.max_usage_in_bytes ]; then - echo $(($(cat /sys/fs/cgroup/memory/memory.max_usage_in_bytes)/1024/1024)) + elif [ -e /sys/fs/cgroup/memory/memory.limit_in_bytes ]; then + echo $(($(cat /sys/fs/cgroup/memory/memory.limit_in_bytes)/1024/1024)) else echo $(($(cat /proc/meminfo | grep MemTotal | sed -E 's/MemTotal:\s+([0-9]+)\s+kB/\1/')/1024)) fi diff --git a/example/prep.d/build_base_images.sh b/example/prep.d/build_base_images.sh index d0a4043..9e2f637 100755 --- a/example/prep.d/build_base_images.sh +++ b/example/prep.d/build_base_images.sh @@ -61,73 +61,73 @@ function build_alpine { } function build_java11 { if [ "${IMAGE_JAVA11_AVAILABLE:-0}" = "1" ]; then - echo "Image danielberteaud/java:11.24.3-2 already available" + echo "Image danielberteaud/java:11.24.3-3 already available" return fi - if ! docker manifest inspect danielberteaud/java:11.24.3-2 > /dev/null 2>&1; then - echo "Building java:11.24.3-2" + if ! docker manifest inspect danielberteaud/java:11.24.3-3 > /dev/null 2>&1; then + echo "Building java:11.24.3-3" export BUILDKIT_PROGRESS=plain - docker build -t danielberteaud/java:11.24.3-2 -t danielberteaud/java11:latest -t danielberteaud/java:11 --build-arg=JAVA_VERSION=11 output/images/java &&\ - docker push danielberteaud/java:11.24.3-2 &&\ + docker build -t danielberteaud/java:11.24.3-3 -t danielberteaud/java11:latest -t danielberteaud/java:11 --build-arg=JAVA_VERSION=11 output/images/java &&\ + docker push danielberteaud/java:11.24.3-3 &&\ docker push danielberteaud/java11:latest &&\ docker push danielberteaud/java:11 &&\ - echo "danielberteaud/java:11.24.3-2 pushed to remote repo" + echo "danielberteaud/java:11.24.3-3 pushed to remote repo" else - echo "Image danielberteaud/java:11.24.3-2 already available" + echo "Image danielberteaud/java:11.24.3-3 already available" fi IMAGE_JAVA11_AVAILABLE=1 } function build_java17 { if [ "${IMAGE_JAVA17_AVAILABLE:-0}" = "1" ]; then - echo "Image danielberteaud/java:17.24.3-2 already available" + echo "Image danielberteaud/java:17.24.3-3 already available" return fi - if ! docker manifest inspect danielberteaud/java:17.24.3-2 > /dev/null 2>&1; then - echo "Building java:17.24.3-2" + if ! docker manifest inspect danielberteaud/java:17.24.3-3 > /dev/null 2>&1; then + echo "Building java:17.24.3-3" export BUILDKIT_PROGRESS=plain - docker build -t danielberteaud/java:17.24.3-2 -t danielberteaud/java17:latest -t danielberteaud/java:17 --build-arg=JAVA_VERSION=17 output/images/java &&\ - docker push danielberteaud/java:17.24.3-2 &&\ + docker build -t danielberteaud/java:17.24.3-3 -t danielberteaud/java17:latest -t danielberteaud/java:17 --build-arg=JAVA_VERSION=17 output/images/java &&\ + docker push danielberteaud/java:17.24.3-3 &&\ docker push danielberteaud/java17:latest &&\ docker push danielberteaud/java:17 &&\ - echo "danielberteaud/java:17.24.3-2 pushed to remote repo" + echo "danielberteaud/java:17.24.3-3 pushed to remote repo" else - echo "Image danielberteaud/java:17.24.3-2 already available" + echo "Image danielberteaud/java:17.24.3-3 already available" fi IMAGE_JAVA17_AVAILABLE=1 } function build_java21 { if [ "${IMAGE_JAVA21_AVAILABLE:-0}" = "1" ]; then - echo "Image danielberteaud/java:21.24.3-2 already available" + echo "Image danielberteaud/java:21.24.3-3 already available" return fi - if ! docker manifest inspect danielberteaud/java:21.24.3-2 > /dev/null 2>&1; then - echo "Building java:21.24.3-2" + if ! docker manifest inspect danielberteaud/java:21.24.3-3 > /dev/null 2>&1; then + echo "Building java:21.24.3-3" export BUILDKIT_PROGRESS=plain - docker build -t danielberteaud/java:21.24.3-2 -t danielberteaud/java21:latest -t danielberteaud/java:21 --build-arg=JAVA_VERSION=21 output/images/java &&\ - docker push danielberteaud/java:21.24.3-2 &&\ + docker build -t danielberteaud/java:21.24.3-3 -t danielberteaud/java21:latest -t danielberteaud/java:21 --build-arg=JAVA_VERSION=21 output/images/java &&\ + docker push danielberteaud/java:21.24.3-3 &&\ docker push danielberteaud/java21:latest &&\ docker push danielberteaud/java:21 &&\ - echo "danielberteaud/java:21.24.3-2 pushed to remote repo" + echo "danielberteaud/java:21.24.3-3 pushed to remote repo" else - echo "Image danielberteaud/java:21.24.3-2 already available" + echo "Image danielberteaud/java:21.24.3-3 already available" fi IMAGE_JAVA21_AVAILABLE=1 } function build_java8 { if [ "${IMAGE_JAVA8_AVAILABLE:-0}" = "1" ]; then - echo "Image danielberteaud/java:8.24.3-2 already available" + echo "Image danielberteaud/java:8.24.3-3 already available" return fi - if ! docker manifest inspect danielberteaud/java:8.24.3-2 > /dev/null 2>&1; then - echo "Building java:8.24.3-2" + if ! docker manifest inspect danielberteaud/java:8.24.3-3 > /dev/null 2>&1; then + echo "Building java:8.24.3-3" export BUILDKIT_PROGRESS=plain - docker build -t danielberteaud/java:8.24.3-2 -t danielberteaud/java8:latest -t danielberteaud/java:8 --build-arg=JAVA_VERSION=8 output/images/java &&\ - docker push danielberteaud/java:8.24.3-2 &&\ + docker build -t danielberteaud/java:8.24.3-3 -t danielberteaud/java8:latest -t danielberteaud/java:8 --build-arg=JAVA_VERSION=8 output/images/java &&\ + docker push danielberteaud/java:8.24.3-3 &&\ docker push danielberteaud/java8:latest &&\ docker push danielberteaud/java:8 &&\ - echo "danielberteaud/java:8.24.3-2 pushed to remote repo" + echo "danielberteaud/java:8.24.3-3 pushed to remote repo" else - echo "Image danielberteaud/java:8.24.3-2 already available" + echo "Image danielberteaud/java:8.24.3-3 already available" fi IMAGE_JAVA8_AVAILABLE=1 } diff --git a/images/java/root/entrypoint.d/30-java.env b/images/java/root/entrypoint.d/30-java.env index 6501b57..841df42 100644 --- a/images/java/root/entrypoint.d/30-java.env +++ b/images/java/root/entrypoint.d/30-java.env @@ -13,8 +13,8 @@ get_max_mem(){ else echo $(($(cat /sys/fs/cgroup/memory.max)/1024/1024)) fi - elif [ -e /sys/fs/cgroup/memory/memory.max_usage_in_bytes ]; then - echo $(($(cat /sys/fs/cgroup/memory/memory.max_usage_in_bytes)/1024/1024)) + elif [ -e /sys/fs/cgroup/memory/memory.limit_in_bytes ]; then + echo $(($(cat /sys/fs/cgroup/memory/memory.limit_in_bytes)/1024/1024)) else echo $(($(cat /proc/meminfo | grep MemTotal | sed -E 's/MemTotal:\s+([0-9]+)\s+kB/\1/')/1024)) fi diff --git a/variables.yml b/variables.yml index ebb9935..9f5649f 100644 --- a/variables.yml +++ b/variables.yml @@ -237,7 +237,7 @@ docker: # Alpine with Java8 (temurin) java8: - image: java:8.24.3-2 + image: java:8.24.3-3 build_args: JAVA_VERSION: 8 tags: @@ -246,7 +246,7 @@ docker: # Alpine with Java11 (temurin) java11: - image: java:11.24.3-2 + image: java:11.24.3-3 build_args: JAVA_VERSION: 11 tags: @@ -255,7 +255,7 @@ docker: # Alpine with Java17 (temurin) java17: - image: java:17.24.3-2 + image: java:17.24.3-3 build_args: JAVA_VERSION: 17 tags: @@ -264,7 +264,7 @@ docker: # Alpine with Java21 (temurin) java21: - image: java:21.24.3-2 + image: java:21.24.3-3 build_args: JAVA_VERSION: 21 tags: