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

Set XMX ratio to 0.3

This commit is contained in:
Daniel Berteaud 2024-03-26 12:12:56 +01:00
parent 0ef381f518
commit c1dd61ce53
6 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
example/base_images.nomad.hcl
View File

@ -34,25 +34,25 @@ job "base_images" {
task "java11" {
driver = "docker"
config {
image = "danielberteaud/java:11.24.3-4"
image = "danielberteaud/java:11.24.3-5"
}
}
task "java17" {
driver = "docker"
config {
image = "danielberteaud/java:17.24.3-4"
image = "danielberteaud/java:17.24.3-5"
}
}
task "java21" {
driver = "docker"
config {
image = "danielberteaud/java:21.24.3-4"
image = "danielberteaud/java:21.24.3-5"
}
}
task "java8" {
driver = "docker"
config {
image = "danielberteaud/java:8.24.3-4"
image = "danielberteaud/java:8.24.3-5"
}
}
task "mariadb" {

2
example/images/java/Dockerfile
View File

@ -9,7 +9,7 @@ ARG JMX_EXPORTER_VERSION=0.19.0
ENV MINIT_LOG_DIR=none \
LANG=fr_FR.utf8 \
TZ=Europe/Paris \
JVM_XMX_RATIO=0.25
JVM_XMX_RATIO=0.3
ADD https://git.lapiole.org/nomad/base_tools.git#master /
RUN set -euxo pipefail &&\

10
example/images/java/root/entrypoint.d/30-java.env
View File

@ -106,12 +106,12 @@ if [ -n "${HTTP_PROXY}" ]; then
fi
# Same for HTTPS_PROXY
if [ -n "${HTTPS_PROXY}" ]; then
JAVA_OPTS="${JAVA_OPTS} -Dhttps.proxyHost=$(echo ${HTTPS_PROXY} | sed -E 's|.+://([^/:]+).*|\1|')"
JAVA_OPTS="${JAVA_OPTS} -Dhttps.proxyPort=$(echo ${HTTPS_PROXY} | sed -E 's|.+://[^/]+:([0-9]+).*|\1|')"
USER=$(parse_url "${HTTP_PROXY}" "user")
PASSWORD=$(parse_url "${HTTP_PROXY}" "password")
JAVA_OPTS="${JAVA_OPTS} -Dhttps.proxyHost=$(parse_url "${HTTPS_PROXY}" "host")"
JAVA_OPTS="${JAVA_OPTS} -Dhttps.proxyPort=$(parse_url "${HTTPS_PROXY}" "port")"
USER=$(parse_url "${HTTPS_PROXY}" "user")
PASSWORD=$(parse_url "${HTTPS_PROXY}" "password")
if [ -n "${USER}" -a -n "${PASSWORD}" ]; then
JAVA_OPTS="${JAVA_OPTS} -Dhttp.proxyUser=${USER} -Dhttp.proxyPassword='${PASSWORD}'"
JAVA_OPTS="${JAVA_OPTS} -Dhttps.proxyUser=${USER} -Dhttps.proxyPassword='${PASSWORD}'"
fi
fi
# For NO_PROXY, we need to replace , with |

56
example/prep.d/build_base_images.sh
View File

@ -61,73 +61,73 @@ function build_alpine {
}
function build_java11 {
if [ "${IMAGE_JAVA11_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/java:11.24.3-4 already available"
echo "Image danielberteaud/java:11.24.3-5 already available"
return
fi
if ! docker manifest inspect danielberteaud/java:11.24.3-4 > /dev/null 2>&1; then
echo "Building java:11.24.3-4"
if ! docker manifest inspect danielberteaud/java:11.24.3-5 > /dev/null 2>&1; then
echo "Building java:11.24.3-5"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/java:11.24.3-4 -t danielberteaud/java11:latest -t danielberteaud/java:11 --build-arg=JAVA_VERSION=11 output/images/java &&\
docker push danielberteaud/java:11.24.3-4 &&\
docker build -t danielberteaud/java:11.24.3-5 -t danielberteaud/java11:latest -t danielberteaud/java:11 --build-arg=JAVA_VERSION=11 output/images/java &&\
docker push danielberteaud/java:11.24.3-5 &&\
docker push danielberteaud/java11:latest &&\
docker push danielberteaud/java:11 &&\
echo "danielberteaud/java:11.24.3-4 pushed to remote repo"
echo "danielberteaud/java:11.24.3-5 pushed to remote repo"
else
echo "Image danielberteaud/java:11.24.3-4 already available"
echo "Image danielberteaud/java:11.24.3-5 already available"
fi
IMAGE_JAVA11_AVAILABLE=1
}
function build_java17 {
if [ "${IMAGE_JAVA17_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/java:17.24.3-4 already available"
echo "Image danielberteaud/java:17.24.3-5 already available"
return
fi
if ! docker manifest inspect danielberteaud/java:17.24.3-4 > /dev/null 2>&1; then
echo "Building java:17.24.3-4"
if ! docker manifest inspect danielberteaud/java:17.24.3-5 > /dev/null 2>&1; then
echo "Building java:17.24.3-5"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/java:17.24.3-4 -t danielberteaud/java17:latest -t danielberteaud/java:17 --build-arg=JAVA_VERSION=17 output/images/java &&\
docker push danielberteaud/java:17.24.3-4 &&\
docker build -t danielberteaud/java:17.24.3-5 -t danielberteaud/java17:latest -t danielberteaud/java:17 --build-arg=JAVA_VERSION=17 output/images/java &&\
docker push danielberteaud/java:17.24.3-5 &&\
docker push danielberteaud/java17:latest &&\
docker push danielberteaud/java:17 &&\
echo "danielberteaud/java:17.24.3-4 pushed to remote repo"
echo "danielberteaud/java:17.24.3-5 pushed to remote repo"
else
echo "Image danielberteaud/java:17.24.3-4 already available"
echo "Image danielberteaud/java:17.24.3-5 already available"
fi
IMAGE_JAVA17_AVAILABLE=1
}
function build_java21 {
if [ "${IMAGE_JAVA21_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/java:21.24.3-4 already available"
echo "Image danielberteaud/java:21.24.3-5 already available"
return
fi
if ! docker manifest inspect danielberteaud/java:21.24.3-4 > /dev/null 2>&1; then
echo "Building java:21.24.3-4"
if ! docker manifest inspect danielberteaud/java:21.24.3-5 > /dev/null 2>&1; then
echo "Building java:21.24.3-5"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/java:21.24.3-4 -t danielberteaud/java21:latest -t danielberteaud/java:21 --build-arg=JAVA_VERSION=21 output/images/java &&\
docker push danielberteaud/java:21.24.3-4 &&\
docker build -t danielberteaud/java:21.24.3-5 -t danielberteaud/java21:latest -t danielberteaud/java:21 --build-arg=JAVA_VERSION=21 output/images/java &&\
docker push danielberteaud/java:21.24.3-5 &&\
docker push danielberteaud/java21:latest &&\
docker push danielberteaud/java:21 &&\
echo "danielberteaud/java:21.24.3-4 pushed to remote repo"
echo "danielberteaud/java:21.24.3-5 pushed to remote repo"
else
echo "Image danielberteaud/java:21.24.3-4 already available"
echo "Image danielberteaud/java:21.24.3-5 already available"
fi
IMAGE_JAVA21_AVAILABLE=1
}
function build_java8 {
if [ "${IMAGE_JAVA8_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/java:8.24.3-4 already available"
echo "Image danielberteaud/java:8.24.3-5 already available"
return
fi
if ! docker manifest inspect danielberteaud/java:8.24.3-4 > /dev/null 2>&1; then
echo "Building java:8.24.3-4"
if ! docker manifest inspect danielberteaud/java:8.24.3-5 > /dev/null 2>&1; then
echo "Building java:8.24.3-5"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/java:8.24.3-4 -t danielberteaud/java8:latest -t danielberteaud/java:8 --build-arg=JAVA_VERSION=8 output/images/java &&\
docker push danielberteaud/java:8.24.3-4 &&\
docker build -t danielberteaud/java:8.24.3-5 -t danielberteaud/java8:latest -t danielberteaud/java:8 --build-arg=JAVA_VERSION=8 output/images/java &&\
docker push danielberteaud/java:8.24.3-5 &&\
docker push danielberteaud/java8:latest &&\
docker push danielberteaud/java:8 &&\
echo "danielberteaud/java:8.24.3-4 pushed to remote repo"
echo "danielberteaud/java:8.24.3-5 pushed to remote repo"
else
echo "Image danielberteaud/java:8.24.3-4 already available"
echo "Image danielberteaud/java:8.24.3-5 already available"
fi
IMAGE_JAVA8_AVAILABLE=1
}

2
images/java/Dockerfile
View File

@ -9,7 +9,7 @@ ARG JMX_EXPORTER_VERSION=0.19.0
ENV MINIT_LOG_DIR=none \
LANG=[[ .locale.lang ]] \
TZ=[[ .locale.tz ]] \
JVM_XMX_RATIO=0.25
JVM_XMX_RATIO=0.3
ADD https://git.lapiole.org/nomad/base_tools.git#master /
RUN set -euxo pipefail &&\

8
variables.yml
View File

@ -240,7 +240,7 @@ docker:
# Alpine with Java8 (temurin)
java8:
image: java:8.24.3-4
image: java:8.24.3-5
build_args:
JAVA_VERSION: 8
tags:
@ -249,7 +249,7 @@ docker:
# Alpine with Java11 (temurin)
java11:
image: java:11.24.3-4
image: java:11.24.3-5
build_args:
JAVA_VERSION: 11
tags:
@ -258,7 +258,7 @@ docker:
# Alpine with Java17 (temurin)
java17:
image: java:17.24.3-4
image: java:17.24.3-5
build_args:
JAVA_VERSION: 17
tags:
@ -267,7 +267,7 @@ docker:
# Alpine with Java21 (temurin)
java21:
image: java:21.24.3-4
image: java:21.24.3-5
build_args:
JAVA_VERSION: 21
tags: