From c01ebb996a74efa592226b10509b3414e8b1a5a6 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 25 Jul 2024 16:41:56 +0100 Subject: [PATCH 1/2] use jinja templating to remove distro specific cases in entrypoint.sh --- 11/jdk/alpine/entrypoint.sh | 40 +++++++++---------- 11/jdk/ubi/ubi9-minimal/entrypoint.sh | 40 +++++++++---------- 11/jdk/ubuntu/focal/entrypoint.sh | 40 +++++++++---------- 11/jdk/ubuntu/jammy/entrypoint.sh | 40 +++++++++---------- 11/jdk/ubuntu/noble/entrypoint.sh | 40 +++++++++---------- 11/jre/alpine/entrypoint.sh | 40 +++++++++---------- 11/jre/ubi/ubi9-minimal/entrypoint.sh | 40 +++++++++---------- 11/jre/ubuntu/focal/entrypoint.sh | 40 +++++++++---------- 11/jre/ubuntu/jammy/entrypoint.sh | 40 +++++++++---------- 11/jre/ubuntu/noble/entrypoint.sh | 40 +++++++++---------- 17/jdk/alpine/entrypoint.sh | 40 +++++++++---------- 17/jdk/ubi/ubi9-minimal/entrypoint.sh | 40 +++++++++---------- 17/jdk/ubuntu/focal/entrypoint.sh | 40 +++++++++---------- 17/jdk/ubuntu/jammy/entrypoint.sh | 40 +++++++++---------- 17/jdk/ubuntu/noble/entrypoint.sh | 40 +++++++++---------- 17/jre/alpine/entrypoint.sh | 40 +++++++++---------- 17/jre/ubi/ubi9-minimal/entrypoint.sh | 40 +++++++++---------- 17/jre/ubuntu/focal/entrypoint.sh | 40 +++++++++---------- 17/jre/ubuntu/jammy/entrypoint.sh | 40 +++++++++---------- 17/jre/ubuntu/noble/entrypoint.sh | 40 +++++++++---------- 21/jdk/alpine/entrypoint.sh | 40 +++++++++---------- 21/jdk/ubi/ubi9-minimal/entrypoint.sh | 40 +++++++++---------- 21/jdk/ubuntu/jammy/entrypoint.sh | 40 +++++++++---------- 21/jdk/ubuntu/noble/entrypoint.sh | 40 +++++++++---------- 21/jre/alpine/entrypoint.sh | 40 +++++++++---------- 21/jre/ubi/ubi9-minimal/entrypoint.sh | 40 +++++++++---------- 21/jre/ubuntu/jammy/entrypoint.sh | 40 +++++++++---------- 21/jre/ubuntu/noble/entrypoint.sh | 40 +++++++++---------- 22/jdk/alpine/entrypoint.sh | 40 +++++++++---------- 22/jdk/ubi/ubi9-minimal/entrypoint.sh | 40 +++++++++---------- 22/jdk/ubuntu/jammy/entrypoint.sh | 40 +++++++++---------- 22/jdk/ubuntu/noble/entrypoint.sh | 40 +++++++++---------- 22/jre/alpine/entrypoint.sh | 40 +++++++++---------- 22/jre/ubi/ubi9-minimal/entrypoint.sh | 40 +++++++++---------- 22/jre/ubuntu/jammy/entrypoint.sh | 40 +++++++++---------- 22/jre/ubuntu/noble/entrypoint.sh | 40 +++++++++---------- 8/jdk/alpine/entrypoint.sh | 40 +++++++++---------- 8/jdk/ubi/ubi9-minimal/entrypoint.sh | 40 +++++++++---------- 8/jdk/ubuntu/focal/entrypoint.sh | 40 +++++++++---------- 8/jdk/ubuntu/jammy/entrypoint.sh | 40 +++++++++---------- 8/jdk/ubuntu/noble/entrypoint.sh | 40 +++++++++---------- 8/jre/alpine/entrypoint.sh | 40 +++++++++---------- 8/jre/ubi/ubi9-minimal/entrypoint.sh | 40 +++++++++---------- 8/jre/ubuntu/focal/entrypoint.sh | 40 +++++++++---------- 8/jre/ubuntu/jammy/entrypoint.sh | 40 +++++++++---------- 8/jre/ubuntu/noble/entrypoint.sh | 40 +++++++++---------- .../{entrypoint.sh => entrypoint.sh.j2} | 31 ++++++-------- generate_dockerfiles.py | 18 ++++++--- 48 files changed, 944 insertions(+), 945 deletions(-) rename docker_templates/{entrypoint.sh => entrypoint.sh.j2} (86%) diff --git a/11/jdk/alpine/entrypoint.sh b/11/jdk/alpine/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/11/jdk/alpine/entrypoint.sh +++ b/11/jdk/alpine/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/11/jdk/ubi/ubi9-minimal/entrypoint.sh b/11/jdk/ubi/ubi9-minimal/entrypoint.sh index dcc51cd2b..cc159d20c 100755 --- a/11/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/11/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ fi + update-ca-trust else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/11/jdk/ubuntu/focal/entrypoint.sh b/11/jdk/ubuntu/focal/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/11/jdk/ubuntu/focal/entrypoint.sh +++ b/11/jdk/ubuntu/focal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/11/jdk/ubuntu/jammy/entrypoint.sh b/11/jdk/ubuntu/jammy/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/11/jdk/ubuntu/jammy/entrypoint.sh +++ b/11/jdk/ubuntu/jammy/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/11/jdk/ubuntu/noble/entrypoint.sh b/11/jdk/ubuntu/noble/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/11/jdk/ubuntu/noble/entrypoint.sh +++ b/11/jdk/ubuntu/noble/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/11/jre/alpine/entrypoint.sh b/11/jre/alpine/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/11/jre/alpine/entrypoint.sh +++ b/11/jre/alpine/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/11/jre/ubi/ubi9-minimal/entrypoint.sh b/11/jre/ubi/ubi9-minimal/entrypoint.sh index dcc51cd2b..cc159d20c 100755 --- a/11/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/11/jre/ubi/ubi9-minimal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ fi + update-ca-trust else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/11/jre/ubuntu/focal/entrypoint.sh b/11/jre/ubuntu/focal/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/11/jre/ubuntu/focal/entrypoint.sh +++ b/11/jre/ubuntu/focal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/11/jre/ubuntu/jammy/entrypoint.sh b/11/jre/ubuntu/jammy/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/11/jre/ubuntu/jammy/entrypoint.sh +++ b/11/jre/ubuntu/jammy/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/11/jre/ubuntu/noble/entrypoint.sh b/11/jre/ubuntu/noble/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/11/jre/ubuntu/noble/entrypoint.sh +++ b/11/jre/ubuntu/noble/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/17/jdk/alpine/entrypoint.sh b/17/jdk/alpine/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/17/jdk/alpine/entrypoint.sh +++ b/17/jdk/alpine/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/17/jdk/ubi/ubi9-minimal/entrypoint.sh b/17/jdk/ubi/ubi9-minimal/entrypoint.sh index dcc51cd2b..cc159d20c 100755 --- a/17/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/17/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ fi + update-ca-trust else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/17/jdk/ubuntu/focal/entrypoint.sh b/17/jdk/ubuntu/focal/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/17/jdk/ubuntu/focal/entrypoint.sh +++ b/17/jdk/ubuntu/focal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/17/jdk/ubuntu/jammy/entrypoint.sh b/17/jdk/ubuntu/jammy/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/17/jdk/ubuntu/jammy/entrypoint.sh +++ b/17/jdk/ubuntu/jammy/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/17/jdk/ubuntu/noble/entrypoint.sh b/17/jdk/ubuntu/noble/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/17/jdk/ubuntu/noble/entrypoint.sh +++ b/17/jdk/ubuntu/noble/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/17/jre/alpine/entrypoint.sh b/17/jre/alpine/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/17/jre/alpine/entrypoint.sh +++ b/17/jre/alpine/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/17/jre/ubi/ubi9-minimal/entrypoint.sh b/17/jre/ubi/ubi9-minimal/entrypoint.sh index dcc51cd2b..cc159d20c 100755 --- a/17/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/17/jre/ubi/ubi9-minimal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ fi + update-ca-trust else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/17/jre/ubuntu/focal/entrypoint.sh b/17/jre/ubuntu/focal/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/17/jre/ubuntu/focal/entrypoint.sh +++ b/17/jre/ubuntu/focal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/17/jre/ubuntu/jammy/entrypoint.sh b/17/jre/ubuntu/jammy/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/17/jre/ubuntu/jammy/entrypoint.sh +++ b/17/jre/ubuntu/jammy/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/17/jre/ubuntu/noble/entrypoint.sh b/17/jre/ubuntu/noble/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/17/jre/ubuntu/noble/entrypoint.sh +++ b/17/jre/ubuntu/noble/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/21/jdk/alpine/entrypoint.sh b/21/jdk/alpine/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/21/jdk/alpine/entrypoint.sh +++ b/21/jdk/alpine/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/21/jdk/ubi/ubi9-minimal/entrypoint.sh b/21/jdk/ubi/ubi9-minimal/entrypoint.sh index dcc51cd2b..cc159d20c 100755 --- a/21/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/21/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ fi + update-ca-trust else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/21/jdk/ubuntu/jammy/entrypoint.sh b/21/jdk/ubuntu/jammy/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/21/jdk/ubuntu/jammy/entrypoint.sh +++ b/21/jdk/ubuntu/jammy/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/21/jdk/ubuntu/noble/entrypoint.sh b/21/jdk/ubuntu/noble/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/21/jdk/ubuntu/noble/entrypoint.sh +++ b/21/jdk/ubuntu/noble/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/21/jre/alpine/entrypoint.sh b/21/jre/alpine/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/21/jre/alpine/entrypoint.sh +++ b/21/jre/alpine/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/21/jre/ubi/ubi9-minimal/entrypoint.sh b/21/jre/ubi/ubi9-minimal/entrypoint.sh index dcc51cd2b..cc159d20c 100755 --- a/21/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/21/jre/ubi/ubi9-minimal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ fi + update-ca-trust else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/21/jre/ubuntu/jammy/entrypoint.sh b/21/jre/ubuntu/jammy/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/21/jre/ubuntu/jammy/entrypoint.sh +++ b/21/jre/ubuntu/jammy/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/21/jre/ubuntu/noble/entrypoint.sh b/21/jre/ubuntu/noble/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/21/jre/ubuntu/noble/entrypoint.sh +++ b/21/jre/ubuntu/noble/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/22/jdk/alpine/entrypoint.sh b/22/jdk/alpine/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/22/jdk/alpine/entrypoint.sh +++ b/22/jdk/alpine/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/22/jdk/ubi/ubi9-minimal/entrypoint.sh b/22/jdk/ubi/ubi9-minimal/entrypoint.sh index dcc51cd2b..cc159d20c 100755 --- a/22/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/22/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ fi + update-ca-trust else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/22/jdk/ubuntu/jammy/entrypoint.sh b/22/jdk/ubuntu/jammy/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/22/jdk/ubuntu/jammy/entrypoint.sh +++ b/22/jdk/ubuntu/jammy/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/22/jdk/ubuntu/noble/entrypoint.sh b/22/jdk/ubuntu/noble/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/22/jdk/ubuntu/noble/entrypoint.sh +++ b/22/jdk/ubuntu/noble/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/22/jre/alpine/entrypoint.sh b/22/jre/alpine/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/22/jre/alpine/entrypoint.sh +++ b/22/jre/alpine/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/22/jre/ubi/ubi9-minimal/entrypoint.sh b/22/jre/ubi/ubi9-minimal/entrypoint.sh index dcc51cd2b..cc159d20c 100755 --- a/22/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/22/jre/ubi/ubi9-minimal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ fi + update-ca-trust else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/22/jre/ubuntu/jammy/entrypoint.sh b/22/jre/ubuntu/jammy/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/22/jre/ubuntu/jammy/entrypoint.sh +++ b/22/jre/ubuntu/jammy/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/22/jre/ubuntu/noble/entrypoint.sh b/22/jre/ubuntu/noble/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/22/jre/ubuntu/noble/entrypoint.sh +++ b/22/jre/ubuntu/noble/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/8/jdk/alpine/entrypoint.sh b/8/jdk/alpine/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/8/jdk/alpine/entrypoint.sh +++ b/8/jdk/alpine/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/8/jdk/ubi/ubi9-minimal/entrypoint.sh b/8/jdk/ubi/ubi9-minimal/entrypoint.sh index dcc51cd2b..cc159d20c 100755 --- a/8/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/8/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ fi + update-ca-trust else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/8/jdk/ubuntu/focal/entrypoint.sh b/8/jdk/ubuntu/focal/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/8/jdk/ubuntu/focal/entrypoint.sh +++ b/8/jdk/ubuntu/focal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/8/jdk/ubuntu/jammy/entrypoint.sh b/8/jdk/ubuntu/jammy/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/8/jdk/ubuntu/jammy/entrypoint.sh +++ b/8/jdk/ubuntu/jammy/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/8/jdk/ubuntu/noble/entrypoint.sh b/8/jdk/ubuntu/noble/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/8/jdk/ubuntu/noble/entrypoint.sh +++ b/8/jdk/ubuntu/noble/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/8/jre/alpine/entrypoint.sh b/8/jre/alpine/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/8/jre/alpine/entrypoint.sh +++ b/8/jre/alpine/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/8/jre/ubi/ubi9-minimal/entrypoint.sh b/8/jre/ubi/ubi9-minimal/entrypoint.sh index dcc51cd2b..cc159d20c 100755 --- a/8/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/8/jre/ubi/ubi9-minimal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ fi + update-ca-trust else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/8/jre/ubuntu/focal/entrypoint.sh b/8/jre/ubuntu/focal/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/8/jre/ubuntu/focal/entrypoint.sh +++ b/8/jre/ubuntu/focal/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/8/jre/ubuntu/jammy/entrypoint.sh b/8/jre/ubuntu/jammy/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/8/jre/ubuntu/jammy/entrypoint.sh +++ b/8/jre/ubuntu/jammy/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/8/jre/ubuntu/noble/entrypoint.sh b/8/jre/ubuntu/noble/entrypoint.sh index dcc51cd2b..41fbb4c48 100755 --- a/8/jre/ubuntu/noble/entrypoint.sh +++ b/8/jre/ubuntu/noble/entrypoint.sh @@ -1,4 +1,22 @@ #!/usr/bin/env sh +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust - fi - - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates + cp -La /certificates/* /usr/local/share/ca-certificates/ fi + update-ca-certificates else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. diff --git a/docker_templates/entrypoint.sh b/docker_templates/entrypoint.sh.j2 similarity index 86% rename from docker_templates/entrypoint.sh rename to docker_templates/entrypoint.sh.j2 index dcc51cd2b..401b1ac02 100755 --- a/docker_templates/entrypoint.sh +++ b/docker_templates/entrypoint.sh.j2 @@ -1,4 +1,5 @@ #!/usr/bin/env sh +{% include 'partials/license.j2' %} # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but # are supported by `sh` in some Linux flavours. @@ -75,27 +76,18 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the # system location, for whatever reason. if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then - - # UBI - if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then - cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ - fi - - # Ubuntu/Alpine - if [ -d /usr/local/share/ca-certificates/ ]; then - cp -La /certificates/* /usr/local/share/ca-certificates/ - fi - fi - - # UBI - if command -v update-ca-trust >/dev/null; then - update-ca-trust + {%- if os == "ubuntu" or os == "alpine-linux" %} + cp -La /certificates/* /usr/local/share/ca-certificates/ + {%- elif os == "ubi9-minimal" %} + cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/ + {%- endif %} fi - # Ubuntu/Alpine - if command -v update-ca-certificates >/dev/null; then - update-ca-certificates - fi + {%- if os == "ubuntu" or os == "alpine-linux" %} + update-ca-certificates + {%- elif os == "ubi9-minimal" %} + update-ca-trust + {%- endif %} else # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`, # but since the JVM is the primary focus here, we can live with that. @@ -107,3 +99,4 @@ fi export JRE_CACERTS_PATH exec "$@" + diff --git a/generate_dockerfiles.py b/generate_dockerfiles.py index ab4a3351c..434adc0e7 100644 --- a/generate_dockerfiles.py +++ b/generate_dockerfiles.py @@ -177,12 +177,18 @@ def archHelper(arch, os_name): # Entrypoint is currently only needed for CA certificate handling, which is not (yet) # available on Windows - # Copy entrypoint.sh to output directory - entrypoint_path = os.path.join("docker_templates", "entrypoint.sh") + # Generate entrypoint.sh + template_entrypoint_file = "entrypoint.sh.j2" + template_entrypoint = env.get_template(template_entrypoint_file) - if os.path.exists(entrypoint_path): - os.system( - f"cp {entrypoint_path} {os.path.join(output_directory, 'entrypoint.sh')}" - ) + entrypoint = template_entrypoint.render( + os=os_name + ) + + with open( + os.path.join(output_directory, "entrypoint.sh"), "w" + ) as out_file: + out_file.write(entrypoint) + os.chmod(os.path.join(output_directory, "entrypoint.sh"), 0o755) print("Dockerfiles generated successfully!") From 5b34fa804e1a82b0a7bdc3d56e4d16240fd28e6d Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 25 Jul 2024 20:20:20 +0100 Subject: [PATCH 2/2] fix shebang logic --- 11/jdk/alpine/Dockerfile | 2 +- 11/jdk/alpine/entrypoint.sh | 2 +- 11/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 11/jdk/ubi/ubi9-minimal/entrypoint.sh | 2 +- 11/jdk/ubuntu/focal/Dockerfile | 4 ++-- 11/jdk/ubuntu/focal/entrypoint.sh | 4 ++-- 11/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 11/jdk/ubuntu/jammy/entrypoint.sh | 4 ++-- 11/jdk/ubuntu/noble/Dockerfile | 4 ++-- 11/jdk/ubuntu/noble/entrypoint.sh | 4 ++-- 11/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 11/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 11/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 11/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 11/jre/alpine/Dockerfile | 2 +- 11/jre/alpine/entrypoint.sh | 2 +- 11/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 11/jre/ubi/ubi9-minimal/entrypoint.sh | 2 +- 11/jre/ubuntu/focal/Dockerfile | 4 ++-- 11/jre/ubuntu/focal/entrypoint.sh | 4 ++-- 11/jre/ubuntu/jammy/Dockerfile | 4 ++-- 11/jre/ubuntu/jammy/entrypoint.sh | 4 ++-- 11/jre/ubuntu/noble/Dockerfile | 4 ++-- 11/jre/ubuntu/noble/entrypoint.sh | 4 ++-- 11/jre/windows/nanoserver-1809/Dockerfile | 2 +- 11/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 11/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 11/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 17/jdk/alpine/Dockerfile | 2 +- 17/jdk/alpine/entrypoint.sh | 2 +- 17/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 17/jdk/ubi/ubi9-minimal/entrypoint.sh | 2 +- 17/jdk/ubuntu/focal/Dockerfile | 4 ++-- 17/jdk/ubuntu/focal/entrypoint.sh | 4 ++-- 17/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 17/jdk/ubuntu/jammy/entrypoint.sh | 4 ++-- 17/jdk/ubuntu/noble/Dockerfile | 4 ++-- 17/jdk/ubuntu/noble/entrypoint.sh | 4 ++-- 17/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 17/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 17/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 17/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 17/jre/alpine/Dockerfile | 2 +- 17/jre/alpine/entrypoint.sh | 2 +- 17/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 17/jre/ubi/ubi9-minimal/entrypoint.sh | 2 +- 17/jre/ubuntu/focal/Dockerfile | 4 ++-- 17/jre/ubuntu/focal/entrypoint.sh | 4 ++-- 17/jre/ubuntu/jammy/Dockerfile | 4 ++-- 17/jre/ubuntu/jammy/entrypoint.sh | 4 ++-- 17/jre/ubuntu/noble/Dockerfile | 4 ++-- 17/jre/ubuntu/noble/entrypoint.sh | 4 ++-- 17/jre/windows/nanoserver-1809/Dockerfile | 2 +- 17/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 17/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 17/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 21/jdk/alpine/Dockerfile | 2 +- 21/jdk/alpine/entrypoint.sh | 2 +- 21/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 21/jdk/ubi/ubi9-minimal/entrypoint.sh | 2 +- 21/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 21/jdk/ubuntu/jammy/entrypoint.sh | 4 ++-- 21/jdk/ubuntu/noble/Dockerfile | 4 ++-- 21/jdk/ubuntu/noble/entrypoint.sh | 4 ++-- 21/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 21/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 21/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 21/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 21/jre/alpine/Dockerfile | 2 +- 21/jre/alpine/entrypoint.sh | 2 +- 21/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 21/jre/ubi/ubi9-minimal/entrypoint.sh | 2 +- 21/jre/ubuntu/jammy/Dockerfile | 4 ++-- 21/jre/ubuntu/jammy/entrypoint.sh | 4 ++-- 21/jre/ubuntu/noble/Dockerfile | 4 ++-- 21/jre/ubuntu/noble/entrypoint.sh | 4 ++-- 21/jre/windows/nanoserver-1809/Dockerfile | 2 +- 21/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 21/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 21/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 22/jdk/alpine/Dockerfile | 2 +- 22/jdk/alpine/entrypoint.sh | 2 +- 22/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 22/jdk/ubi/ubi9-minimal/entrypoint.sh | 2 +- 22/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 22/jdk/ubuntu/jammy/entrypoint.sh | 4 ++-- 22/jdk/ubuntu/noble/Dockerfile | 4 ++-- 22/jdk/ubuntu/noble/entrypoint.sh | 4 ++-- 22/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 22/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 22/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 22/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 22/jre/alpine/Dockerfile | 2 +- 22/jre/alpine/entrypoint.sh | 2 +- 22/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 22/jre/ubi/ubi9-minimal/entrypoint.sh | 2 +- 22/jre/ubuntu/jammy/Dockerfile | 4 ++-- 22/jre/ubuntu/jammy/entrypoint.sh | 4 ++-- 22/jre/ubuntu/noble/Dockerfile | 4 ++-- 22/jre/ubuntu/noble/entrypoint.sh | 4 ++-- 22/jre/windows/nanoserver-1809/Dockerfile | 2 +- 22/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 22/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 22/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 8/jdk/alpine/Dockerfile | 2 +- 8/jdk/alpine/entrypoint.sh | 2 +- 8/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 8/jdk/ubi/ubi9-minimal/entrypoint.sh | 2 +- 8/jdk/ubuntu/focal/Dockerfile | 4 ++-- 8/jdk/ubuntu/focal/entrypoint.sh | 4 ++-- 8/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 8/jdk/ubuntu/jammy/entrypoint.sh | 4 ++-- 8/jdk/ubuntu/noble/Dockerfile | 4 ++-- 8/jdk/ubuntu/noble/entrypoint.sh | 4 ++-- 8/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 8/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 8/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 8/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 8/jre/alpine/Dockerfile | 2 +- 8/jre/alpine/entrypoint.sh | 2 +- 8/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 8/jre/ubi/ubi9-minimal/entrypoint.sh | 2 +- 8/jre/ubuntu/focal/Dockerfile | 4 ++-- 8/jre/ubuntu/focal/entrypoint.sh | 4 ++-- 8/jre/ubuntu/jammy/Dockerfile | 4 ++-- 8/jre/ubuntu/jammy/entrypoint.sh | 4 ++-- 8/jre/ubuntu/noble/Dockerfile | 4 ++-- 8/jre/ubuntu/noble/entrypoint.sh | 4 ++-- 8/jre/windows/nanoserver-1809/Dockerfile | 2 +- 8/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 8/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 8/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- config/hotspot.yml | 3 --- docker_templates/entrypoint.sh.j2 | 4 ++++ docker_templates/partials/license.j2 | 2 +- docker_templates/ubuntu.Dockerfile.j2 | 4 ++-- generate_dockerfiles.py | 4 +--- 137 files changed, 192 insertions(+), 193 deletions(-) diff --git a/11/jdk/alpine/Dockerfile b/11/jdk/alpine/Dockerfile index 8443793f8..6b2dc1b78 100644 --- a/11/jdk/alpine/Dockerfile +++ b/11/jdk/alpine/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jdk/alpine/entrypoint.sh b/11/jdk/alpine/entrypoint.sh index 41fbb4c48..c3f02618e 100755 --- a/11/jdk/alpine/entrypoint.sh +++ b/11/jdk/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jdk/ubi/ubi9-minimal/Dockerfile b/11/jdk/ubi/ubi9-minimal/Dockerfile index 783c1c3bf..736333018 100644 --- a/11/jdk/ubi/ubi9-minimal/Dockerfile +++ b/11/jdk/ubi/ubi9-minimal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jdk/ubi/ubi9-minimal/entrypoint.sh b/11/jdk/ubi/ubi9-minimal/entrypoint.sh index cc159d20c..09be1167d 100755 --- a/11/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/11/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jdk/ubuntu/focal/Dockerfile b/11/jdk/ubuntu/focal/Dockerfile index ced4de72f..7785724f2 100644 --- a/11/jdk/ubuntu/focal/Dockerfile +++ b/11/jdk/ubuntu/focal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -100,6 +100,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubuntu/focal/entrypoint.sh b/11/jdk/ubuntu/focal/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/11/jdk/ubuntu/focal/entrypoint.sh +++ b/11/jdk/ubuntu/focal/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jdk/ubuntu/jammy/Dockerfile b/11/jdk/ubuntu/jammy/Dockerfile index 6f5d50ba8..b32ecab9b 100644 --- a/11/jdk/ubuntu/jammy/Dockerfile +++ b/11/jdk/ubuntu/jammy/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -100,6 +100,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubuntu/jammy/entrypoint.sh b/11/jdk/ubuntu/jammy/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/11/jdk/ubuntu/jammy/entrypoint.sh +++ b/11/jdk/ubuntu/jammy/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jdk/ubuntu/noble/Dockerfile b/11/jdk/ubuntu/noble/Dockerfile index 6d9976623..dc0797cca 100644 --- a/11/jdk/ubuntu/noble/Dockerfile +++ b/11/jdk/ubuntu/noble/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -100,6 +100,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubuntu/noble/entrypoint.sh b/11/jdk/ubuntu/noble/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/11/jdk/ubuntu/noble/entrypoint.sh +++ b/11/jdk/ubuntu/noble/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile b/11/jdk/windows/nanoserver-1809/Dockerfile index 608383fb2..4b08d43a5 100644 --- a/11/jdk/windows/nanoserver-1809/Dockerfile +++ b/11/jdk/windows/nanoserver-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile index dc1c16380..c50508130 100644 --- a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jdk/windows/windowsservercore-1809/Dockerfile b/11/jdk/windows/windowsservercore-1809/Dockerfile index dd1d76011..0cde96461 100644 --- a/11/jdk/windows/windowsservercore-1809/Dockerfile +++ b/11/jdk/windows/windowsservercore-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 9fe8159ca..75cf96a7e 100644 --- a/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/alpine/Dockerfile b/11/jre/alpine/Dockerfile index c02f16c04..f5254041e 100644 --- a/11/jre/alpine/Dockerfile +++ b/11/jre/alpine/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/alpine/entrypoint.sh b/11/jre/alpine/entrypoint.sh index 41fbb4c48..c3f02618e 100755 --- a/11/jre/alpine/entrypoint.sh +++ b/11/jre/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/ubi/ubi9-minimal/Dockerfile b/11/jre/ubi/ubi9-minimal/Dockerfile index 492b564f0..25a03b51c 100644 --- a/11/jre/ubi/ubi9-minimal/Dockerfile +++ b/11/jre/ubi/ubi9-minimal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/ubi/ubi9-minimal/entrypoint.sh b/11/jre/ubi/ubi9-minimal/entrypoint.sh index cc159d20c..09be1167d 100755 --- a/11/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/11/jre/ubi/ubi9-minimal/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/ubuntu/focal/Dockerfile b/11/jre/ubuntu/focal/Dockerfile index bbf2da35c..e55c6226a 100644 --- a/11/jre/ubuntu/focal/Dockerfile +++ b/11/jre/ubuntu/focal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/focal/entrypoint.sh b/11/jre/ubuntu/focal/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/11/jre/ubuntu/focal/entrypoint.sh +++ b/11/jre/ubuntu/focal/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/ubuntu/jammy/Dockerfile b/11/jre/ubuntu/jammy/Dockerfile index e83a6b1cc..1438bd97d 100644 --- a/11/jre/ubuntu/jammy/Dockerfile +++ b/11/jre/ubuntu/jammy/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/jammy/entrypoint.sh b/11/jre/ubuntu/jammy/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/11/jre/ubuntu/jammy/entrypoint.sh +++ b/11/jre/ubuntu/jammy/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/ubuntu/noble/Dockerfile b/11/jre/ubuntu/noble/Dockerfile index 823e6c30b..e1ecfaed3 100644 --- a/11/jre/ubuntu/noble/Dockerfile +++ b/11/jre/ubuntu/noble/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/noble/entrypoint.sh b/11/jre/ubuntu/noble/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/11/jre/ubuntu/noble/entrypoint.sh +++ b/11/jre/ubuntu/noble/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/windows/nanoserver-1809/Dockerfile b/11/jre/windows/nanoserver-1809/Dockerfile index ebac5513d..ebd8f4c6c 100644 --- a/11/jre/windows/nanoserver-1809/Dockerfile +++ b/11/jre/windows/nanoserver-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/windows/nanoserver-ltsc2022/Dockerfile b/11/jre/windows/nanoserver-ltsc2022/Dockerfile index bcbfdc1e2..b45eb7ef1 100644 --- a/11/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/11/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/windows/windowsservercore-1809/Dockerfile b/11/jre/windows/windowsservercore-1809/Dockerfile index b454244b2..880ee7662 100644 --- a/11/jre/windows/windowsservercore-1809/Dockerfile +++ b/11/jre/windows/windowsservercore-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/11/jre/windows/windowsservercore-ltsc2022/Dockerfile b/11/jre/windows/windowsservercore-ltsc2022/Dockerfile index 9c5b59663..8b83a3f61 100644 --- a/11/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/11/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/alpine/Dockerfile b/17/jdk/alpine/Dockerfile index f351d299d..b9a1fad7c 100644 --- a/17/jdk/alpine/Dockerfile +++ b/17/jdk/alpine/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/alpine/entrypoint.sh b/17/jdk/alpine/entrypoint.sh index 41fbb4c48..c3f02618e 100755 --- a/17/jdk/alpine/entrypoint.sh +++ b/17/jdk/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/ubi/ubi9-minimal/Dockerfile b/17/jdk/ubi/ubi9-minimal/Dockerfile index 7cc7598d0..f084a7057 100644 --- a/17/jdk/ubi/ubi9-minimal/Dockerfile +++ b/17/jdk/ubi/ubi9-minimal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/ubi/ubi9-minimal/entrypoint.sh b/17/jdk/ubi/ubi9-minimal/entrypoint.sh index cc159d20c..09be1167d 100755 --- a/17/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/17/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/ubuntu/focal/Dockerfile b/17/jdk/ubuntu/focal/Dockerfile index 669e7130a..dfcfd223f 100644 --- a/17/jdk/ubuntu/focal/Dockerfile +++ b/17/jdk/ubuntu/focal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -103,6 +103,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubuntu/focal/entrypoint.sh b/17/jdk/ubuntu/focal/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/17/jdk/ubuntu/focal/entrypoint.sh +++ b/17/jdk/ubuntu/focal/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/ubuntu/jammy/Dockerfile b/17/jdk/ubuntu/jammy/Dockerfile index 9cdf27770..132a94f11 100644 --- a/17/jdk/ubuntu/jammy/Dockerfile +++ b/17/jdk/ubuntu/jammy/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -103,6 +103,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubuntu/jammy/entrypoint.sh b/17/jdk/ubuntu/jammy/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/17/jdk/ubuntu/jammy/entrypoint.sh +++ b/17/jdk/ubuntu/jammy/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/ubuntu/noble/Dockerfile b/17/jdk/ubuntu/noble/Dockerfile index ca0f958f3..f9ef5f4a0 100644 --- a/17/jdk/ubuntu/noble/Dockerfile +++ b/17/jdk/ubuntu/noble/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -103,6 +103,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubuntu/noble/entrypoint.sh b/17/jdk/ubuntu/noble/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/17/jdk/ubuntu/noble/entrypoint.sh +++ b/17/jdk/ubuntu/noble/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/windows/nanoserver-1809/Dockerfile b/17/jdk/windows/nanoserver-1809/Dockerfile index 576ccdd76..4f6d21e53 100644 --- a/17/jdk/windows/nanoserver-1809/Dockerfile +++ b/17/jdk/windows/nanoserver-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/windows/nanoserver-ltsc2022/Dockerfile b/17/jdk/windows/nanoserver-ltsc2022/Dockerfile index 0b2c7d4ec..8d0bfa294 100644 --- a/17/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/17/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/windows/windowsservercore-1809/Dockerfile b/17/jdk/windows/windowsservercore-1809/Dockerfile index a760aafe8..1826e2d59 100644 --- a/17/jdk/windows/windowsservercore-1809/Dockerfile +++ b/17/jdk/windows/windowsservercore-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 436d4fde9..a152fef82 100644 --- a/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/alpine/Dockerfile b/17/jre/alpine/Dockerfile index 29fc49a93..32554041b 100644 --- a/17/jre/alpine/Dockerfile +++ b/17/jre/alpine/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/alpine/entrypoint.sh b/17/jre/alpine/entrypoint.sh index 41fbb4c48..c3f02618e 100755 --- a/17/jre/alpine/entrypoint.sh +++ b/17/jre/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/ubi/ubi9-minimal/Dockerfile b/17/jre/ubi/ubi9-minimal/Dockerfile index 9fe05cba6..9ccc76d3a 100644 --- a/17/jre/ubi/ubi9-minimal/Dockerfile +++ b/17/jre/ubi/ubi9-minimal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/ubi/ubi9-minimal/entrypoint.sh b/17/jre/ubi/ubi9-minimal/entrypoint.sh index cc159d20c..09be1167d 100755 --- a/17/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/17/jre/ubi/ubi9-minimal/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/ubuntu/focal/Dockerfile b/17/jre/ubuntu/focal/Dockerfile index 40c4b1b2a..2f9f36f23 100644 --- a/17/jre/ubuntu/focal/Dockerfile +++ b/17/jre/ubuntu/focal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/focal/entrypoint.sh b/17/jre/ubuntu/focal/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/17/jre/ubuntu/focal/entrypoint.sh +++ b/17/jre/ubuntu/focal/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/ubuntu/jammy/Dockerfile b/17/jre/ubuntu/jammy/Dockerfile index 0411cbcdd..b2598c80e 100644 --- a/17/jre/ubuntu/jammy/Dockerfile +++ b/17/jre/ubuntu/jammy/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/jammy/entrypoint.sh b/17/jre/ubuntu/jammy/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/17/jre/ubuntu/jammy/entrypoint.sh +++ b/17/jre/ubuntu/jammy/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/ubuntu/noble/Dockerfile b/17/jre/ubuntu/noble/Dockerfile index 7e32e9ba1..9cb7a195c 100644 --- a/17/jre/ubuntu/noble/Dockerfile +++ b/17/jre/ubuntu/noble/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/noble/entrypoint.sh b/17/jre/ubuntu/noble/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/17/jre/ubuntu/noble/entrypoint.sh +++ b/17/jre/ubuntu/noble/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/windows/nanoserver-1809/Dockerfile b/17/jre/windows/nanoserver-1809/Dockerfile index f77a12c2e..6a7ea9cad 100644 --- a/17/jre/windows/nanoserver-1809/Dockerfile +++ b/17/jre/windows/nanoserver-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/windows/nanoserver-ltsc2022/Dockerfile b/17/jre/windows/nanoserver-ltsc2022/Dockerfile index 6d0d7a569..345d14587 100644 --- a/17/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/17/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/windows/windowsservercore-1809/Dockerfile b/17/jre/windows/windowsservercore-1809/Dockerfile index 0dea88744..25eb6e4a4 100644 --- a/17/jre/windows/windowsservercore-1809/Dockerfile +++ b/17/jre/windows/windowsservercore-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/17/jre/windows/windowsservercore-ltsc2022/Dockerfile b/17/jre/windows/windowsservercore-ltsc2022/Dockerfile index 16da9b031..b2978d704 100644 --- a/17/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/17/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jdk/alpine/Dockerfile b/21/jdk/alpine/Dockerfile index c9f27519d..01bae8796 100644 --- a/21/jdk/alpine/Dockerfile +++ b/21/jdk/alpine/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jdk/alpine/entrypoint.sh b/21/jdk/alpine/entrypoint.sh index 41fbb4c48..c3f02618e 100755 --- a/21/jdk/alpine/entrypoint.sh +++ b/21/jdk/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jdk/ubi/ubi9-minimal/Dockerfile b/21/jdk/ubi/ubi9-minimal/Dockerfile index 2d6cfb2ab..375f97d2e 100644 --- a/21/jdk/ubi/ubi9-minimal/Dockerfile +++ b/21/jdk/ubi/ubi9-minimal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jdk/ubi/ubi9-minimal/entrypoint.sh b/21/jdk/ubi/ubi9-minimal/entrypoint.sh index cc159d20c..09be1167d 100755 --- a/21/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/21/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jdk/ubuntu/jammy/Dockerfile b/21/jdk/ubuntu/jammy/Dockerfile index 17732f4a6..133239fbc 100644 --- a/21/jdk/ubuntu/jammy/Dockerfile +++ b/21/jdk/ubuntu/jammy/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -99,6 +99,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/21/jdk/ubuntu/jammy/entrypoint.sh b/21/jdk/ubuntu/jammy/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/21/jdk/ubuntu/jammy/entrypoint.sh +++ b/21/jdk/ubuntu/jammy/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jdk/ubuntu/noble/Dockerfile b/21/jdk/ubuntu/noble/Dockerfile index bc43e034a..5aae3ad2d 100644 --- a/21/jdk/ubuntu/noble/Dockerfile +++ b/21/jdk/ubuntu/noble/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -99,6 +99,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/21/jdk/ubuntu/noble/entrypoint.sh b/21/jdk/ubuntu/noble/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/21/jdk/ubuntu/noble/entrypoint.sh +++ b/21/jdk/ubuntu/noble/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jdk/windows/nanoserver-1809/Dockerfile b/21/jdk/windows/nanoserver-1809/Dockerfile index a986f77be..f14440fad 100644 --- a/21/jdk/windows/nanoserver-1809/Dockerfile +++ b/21/jdk/windows/nanoserver-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jdk/windows/nanoserver-ltsc2022/Dockerfile b/21/jdk/windows/nanoserver-ltsc2022/Dockerfile index 6f667bb48..ad58ac7d8 100644 --- a/21/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/21/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jdk/windows/windowsservercore-1809/Dockerfile b/21/jdk/windows/windowsservercore-1809/Dockerfile index 0570a1022..f645044a9 100644 --- a/21/jdk/windows/windowsservercore-1809/Dockerfile +++ b/21/jdk/windows/windowsservercore-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 31c272e9c..0b89e1517 100644 --- a/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jre/alpine/Dockerfile b/21/jre/alpine/Dockerfile index 4b59fbe16..52799021d 100644 --- a/21/jre/alpine/Dockerfile +++ b/21/jre/alpine/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jre/alpine/entrypoint.sh b/21/jre/alpine/entrypoint.sh index 41fbb4c48..c3f02618e 100755 --- a/21/jre/alpine/entrypoint.sh +++ b/21/jre/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jre/ubi/ubi9-minimal/Dockerfile b/21/jre/ubi/ubi9-minimal/Dockerfile index d3cfe952b..d14d86656 100644 --- a/21/jre/ubi/ubi9-minimal/Dockerfile +++ b/21/jre/ubi/ubi9-minimal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jre/ubi/ubi9-minimal/entrypoint.sh b/21/jre/ubi/ubi9-minimal/entrypoint.sh index cc159d20c..09be1167d 100755 --- a/21/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/21/jre/ubi/ubi9-minimal/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jre/ubuntu/jammy/Dockerfile b/21/jre/ubuntu/jammy/Dockerfile index c4e1bfff0..a7d00900f 100644 --- a/21/jre/ubuntu/jammy/Dockerfile +++ b/21/jre/ubuntu/jammy/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -94,4 +94,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubuntu/jammy/entrypoint.sh b/21/jre/ubuntu/jammy/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/21/jre/ubuntu/jammy/entrypoint.sh +++ b/21/jre/ubuntu/jammy/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jre/ubuntu/noble/Dockerfile b/21/jre/ubuntu/noble/Dockerfile index bcdb398e6..f8b6ac128 100644 --- a/21/jre/ubuntu/noble/Dockerfile +++ b/21/jre/ubuntu/noble/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -94,4 +94,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubuntu/noble/entrypoint.sh b/21/jre/ubuntu/noble/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/21/jre/ubuntu/noble/entrypoint.sh +++ b/21/jre/ubuntu/noble/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jre/windows/nanoserver-1809/Dockerfile b/21/jre/windows/nanoserver-1809/Dockerfile index 5f38cd56f..849fe8119 100644 --- a/21/jre/windows/nanoserver-1809/Dockerfile +++ b/21/jre/windows/nanoserver-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jre/windows/nanoserver-ltsc2022/Dockerfile b/21/jre/windows/nanoserver-ltsc2022/Dockerfile index 86eb14dc0..78481dd3c 100644 --- a/21/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/21/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jre/windows/windowsservercore-1809/Dockerfile b/21/jre/windows/windowsservercore-1809/Dockerfile index 78a64ba8d..da8e75495 100644 --- a/21/jre/windows/windowsservercore-1809/Dockerfile +++ b/21/jre/windows/windowsservercore-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/21/jre/windows/windowsservercore-ltsc2022/Dockerfile b/21/jre/windows/windowsservercore-ltsc2022/Dockerfile index f72a68929..8b03a818b 100644 --- a/21/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/21/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jdk/alpine/Dockerfile b/22/jdk/alpine/Dockerfile index 79f1b57b2..5b20df4d8 100644 --- a/22/jdk/alpine/Dockerfile +++ b/22/jdk/alpine/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jdk/alpine/entrypoint.sh b/22/jdk/alpine/entrypoint.sh index 41fbb4c48..c3f02618e 100755 --- a/22/jdk/alpine/entrypoint.sh +++ b/22/jdk/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jdk/ubi/ubi9-minimal/Dockerfile b/22/jdk/ubi/ubi9-minimal/Dockerfile index c7e956427..fa33c10fa 100644 --- a/22/jdk/ubi/ubi9-minimal/Dockerfile +++ b/22/jdk/ubi/ubi9-minimal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jdk/ubi/ubi9-minimal/entrypoint.sh b/22/jdk/ubi/ubi9-minimal/entrypoint.sh index cc159d20c..09be1167d 100755 --- a/22/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/22/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jdk/ubuntu/jammy/Dockerfile b/22/jdk/ubuntu/jammy/Dockerfile index 0a68998ba..ec0f33034 100644 --- a/22/jdk/ubuntu/jammy/Dockerfile +++ b/22/jdk/ubuntu/jammy/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -97,6 +97,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/22/jdk/ubuntu/jammy/entrypoint.sh b/22/jdk/ubuntu/jammy/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/22/jdk/ubuntu/jammy/entrypoint.sh +++ b/22/jdk/ubuntu/jammy/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jdk/ubuntu/noble/Dockerfile b/22/jdk/ubuntu/noble/Dockerfile index fa41d3d99..39fce803e 100644 --- a/22/jdk/ubuntu/noble/Dockerfile +++ b/22/jdk/ubuntu/noble/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -97,6 +97,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/22/jdk/ubuntu/noble/entrypoint.sh b/22/jdk/ubuntu/noble/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/22/jdk/ubuntu/noble/entrypoint.sh +++ b/22/jdk/ubuntu/noble/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jdk/windows/nanoserver-1809/Dockerfile b/22/jdk/windows/nanoserver-1809/Dockerfile index f542b7462..a5d4e09ba 100644 --- a/22/jdk/windows/nanoserver-1809/Dockerfile +++ b/22/jdk/windows/nanoserver-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jdk/windows/nanoserver-ltsc2022/Dockerfile b/22/jdk/windows/nanoserver-ltsc2022/Dockerfile index 177533443..9bb8993c3 100644 --- a/22/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/22/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jdk/windows/windowsservercore-1809/Dockerfile b/22/jdk/windows/windowsservercore-1809/Dockerfile index 374710994..7aca8f36e 100644 --- a/22/jdk/windows/windowsservercore-1809/Dockerfile +++ b/22/jdk/windows/windowsservercore-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 6fd8c98e4..c5a441539 100644 --- a/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jre/alpine/Dockerfile b/22/jre/alpine/Dockerfile index 01f77b4a4..f27a32121 100644 --- a/22/jre/alpine/Dockerfile +++ b/22/jre/alpine/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jre/alpine/entrypoint.sh b/22/jre/alpine/entrypoint.sh index 41fbb4c48..c3f02618e 100755 --- a/22/jre/alpine/entrypoint.sh +++ b/22/jre/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jre/ubi/ubi9-minimal/Dockerfile b/22/jre/ubi/ubi9-minimal/Dockerfile index 3f8715bf1..da209dcac 100644 --- a/22/jre/ubi/ubi9-minimal/Dockerfile +++ b/22/jre/ubi/ubi9-minimal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jre/ubi/ubi9-minimal/entrypoint.sh b/22/jre/ubi/ubi9-minimal/entrypoint.sh index cc159d20c..09be1167d 100755 --- a/22/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/22/jre/ubi/ubi9-minimal/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jre/ubuntu/jammy/Dockerfile b/22/jre/ubuntu/jammy/Dockerfile index 714892d7a..46e2cbadd 100644 --- a/22/jre/ubuntu/jammy/Dockerfile +++ b/22/jre/ubuntu/jammy/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -92,4 +92,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/22/jre/ubuntu/jammy/entrypoint.sh b/22/jre/ubuntu/jammy/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/22/jre/ubuntu/jammy/entrypoint.sh +++ b/22/jre/ubuntu/jammy/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jre/ubuntu/noble/Dockerfile b/22/jre/ubuntu/noble/Dockerfile index 65571a1a1..1bda68aa5 100644 --- a/22/jre/ubuntu/noble/Dockerfile +++ b/22/jre/ubuntu/noble/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -92,4 +92,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/22/jre/ubuntu/noble/entrypoint.sh b/22/jre/ubuntu/noble/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/22/jre/ubuntu/noble/entrypoint.sh +++ b/22/jre/ubuntu/noble/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jre/windows/nanoserver-1809/Dockerfile b/22/jre/windows/nanoserver-1809/Dockerfile index 14df9cca7..22201ab09 100644 --- a/22/jre/windows/nanoserver-1809/Dockerfile +++ b/22/jre/windows/nanoserver-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jre/windows/nanoserver-ltsc2022/Dockerfile b/22/jre/windows/nanoserver-ltsc2022/Dockerfile index 7a66c39f8..4a8d37113 100644 --- a/22/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/22/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jre/windows/windowsservercore-1809/Dockerfile b/22/jre/windows/windowsservercore-1809/Dockerfile index 98789cc8d..8e6ff35f2 100644 --- a/22/jre/windows/windowsservercore-1809/Dockerfile +++ b/22/jre/windows/windowsservercore-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/22/jre/windows/windowsservercore-ltsc2022/Dockerfile b/22/jre/windows/windowsservercore-ltsc2022/Dockerfile index a10ea0a8a..9785d07d0 100644 --- a/22/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/22/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/alpine/Dockerfile b/8/jdk/alpine/Dockerfile index 2b79e9f3f..0c5489763 100644 --- a/8/jdk/alpine/Dockerfile +++ b/8/jdk/alpine/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/alpine/entrypoint.sh b/8/jdk/alpine/entrypoint.sh index 41fbb4c48..c3f02618e 100755 --- a/8/jdk/alpine/entrypoint.sh +++ b/8/jdk/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/ubi/ubi9-minimal/Dockerfile b/8/jdk/ubi/ubi9-minimal/Dockerfile index 030e63d15..47229398d 100644 --- a/8/jdk/ubi/ubi9-minimal/Dockerfile +++ b/8/jdk/ubi/ubi9-minimal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/ubi/ubi9-minimal/entrypoint.sh b/8/jdk/ubi/ubi9-minimal/entrypoint.sh index cc159d20c..09be1167d 100755 --- a/8/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/8/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index 6a91f96f7..ff1850935 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -96,4 +96,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/focal/entrypoint.sh b/8/jdk/ubuntu/focal/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/8/jdk/ubuntu/focal/entrypoint.sh +++ b/8/jdk/ubuntu/focal/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/ubuntu/jammy/Dockerfile b/8/jdk/ubuntu/jammy/Dockerfile index a81eeb80f..c6f272a92 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -96,4 +96,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/jammy/entrypoint.sh b/8/jdk/ubuntu/jammy/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/8/jdk/ubuntu/jammy/entrypoint.sh +++ b/8/jdk/ubuntu/jammy/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/ubuntu/noble/Dockerfile b/8/jdk/ubuntu/noble/Dockerfile index e4aa7a51f..59ea675c2 100644 --- a/8/jdk/ubuntu/noble/Dockerfile +++ b/8/jdk/ubuntu/noble/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -96,4 +96,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/noble/entrypoint.sh b/8/jdk/ubuntu/noble/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/8/jdk/ubuntu/noble/entrypoint.sh +++ b/8/jdk/ubuntu/noble/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile b/8/jdk/windows/nanoserver-1809/Dockerfile index 17df0ca11..850540eba 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile +++ b/8/jdk/windows/nanoserver-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile index 3d5e2d955..69424d228 100644 --- a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/windows/windowsservercore-1809/Dockerfile b/8/jdk/windows/windowsservercore-1809/Dockerfile index ed16e1dfe..48e9d9b4b 100644 --- a/8/jdk/windows/windowsservercore-1809/Dockerfile +++ b/8/jdk/windows/windowsservercore-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 3bbe14634..50f75fd22 100644 --- a/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/alpine/Dockerfile b/8/jre/alpine/Dockerfile index 5e2245f9c..c25b62992 100644 --- a/8/jre/alpine/Dockerfile +++ b/8/jre/alpine/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/alpine/entrypoint.sh b/8/jre/alpine/entrypoint.sh index 41fbb4c48..c3f02618e 100755 --- a/8/jre/alpine/entrypoint.sh +++ b/8/jre/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/ubi/ubi9-minimal/Dockerfile b/8/jre/ubi/ubi9-minimal/Dockerfile index 582f238ef..2724e6d6b 100644 --- a/8/jre/ubi/ubi9-minimal/Dockerfile +++ b/8/jre/ubi/ubi9-minimal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/ubi/ubi9-minimal/entrypoint.sh b/8/jre/ubi/ubi9-minimal/entrypoint.sh index cc159d20c..09be1167d 100755 --- a/8/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/8/jre/ubi/ubi9-minimal/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index d3a1d52b6..83c57b899 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -95,4 +95,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/focal/entrypoint.sh b/8/jre/ubuntu/focal/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/8/jre/ubuntu/focal/entrypoint.sh +++ b/8/jre/ubuntu/focal/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/ubuntu/jammy/Dockerfile b/8/jre/ubuntu/jammy/Dockerfile index 88c175088..1ae8f2c2a 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -95,4 +95,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/jammy/entrypoint.sh b/8/jre/ubuntu/jammy/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/8/jre/ubuntu/jammy/entrypoint.sh +++ b/8/jre/ubuntu/jammy/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/ubuntu/noble/Dockerfile b/8/jre/ubuntu/noble/Dockerfile index 982b49743..e97bf7008 100644 --- a/8/jre/ubuntu/noble/Dockerfile +++ b/8/jre/ubuntu/noble/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ @@ -95,4 +95,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/bin/bash", "/__cacert_entrypoint.sh"] +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/noble/entrypoint.sh b/8/jre/ubuntu/noble/entrypoint.sh index 41fbb4c48..2d2040468 100755 --- a/8/jre/ubuntu/noble/entrypoint.sh +++ b/8/jre/ubuntu/noble/entrypoint.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/windows/nanoserver-1809/Dockerfile b/8/jre/windows/nanoserver-1809/Dockerfile index b1985196a..958458754 100644 --- a/8/jre/windows/nanoserver-1809/Dockerfile +++ b/8/jre/windows/nanoserver-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/windows/nanoserver-ltsc2022/Dockerfile b/8/jre/windows/nanoserver-ltsc2022/Dockerfile index 9f4881ce0..dd1f96704 100644 --- a/8/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/windows/windowsservercore-1809/Dockerfile b/8/jre/windows/windowsservercore-1809/Dockerfile index 05ee81764..e7dc705ca 100644 --- a/8/jre/windows/windowsservercore-1809/Dockerfile +++ b/8/jre/windows/windowsservercore-1809/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/8/jre/windows/windowsservercore-ltsc2022/Dockerfile b/8/jre/windows/windowsservercore-ltsc2022/Dockerfile index 234c0310f..a8a82d8ea 100644 --- a/8/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/8/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/config/hotspot.yml b/config/hotspot.yml index 8b47bc518..15e1d7775 100644 --- a/config/hotspot.yml +++ b/config/hotspot.yml @@ -23,7 +23,6 @@ configurations: architectures: [aarch64, arm, ppc64le, s390x, x64] # `bash` is required for Ubuntu-based images to correctly resolve # environment variables.with.dots.in.them. - shebang: /bin/bash os: ubuntu - directory: ubuntu/jammy @@ -32,7 +31,6 @@ configurations: deprecated: 23 # `bash` is required for Ubuntu-based images to correctly resolve # environment variables.with.dots.in.them. - shebang: /bin/bash os: ubuntu - directory: ubuntu/focal @@ -41,7 +39,6 @@ configurations: deprecated: 20 # `bash` is required for Ubuntu-based images to correctly resolve # environment variables.with.dots.in.them. - shebang: /bin/bash os: ubuntu - directory: ubi/ubi9-minimal diff --git a/docker_templates/entrypoint.sh.j2 b/docker_templates/entrypoint.sh.j2 index 401b1ac02..4e4baac20 100755 --- a/docker_templates/entrypoint.sh.j2 +++ b/docker_templates/entrypoint.sh.j2 @@ -1,4 +1,8 @@ +{%- if os == "ubuntu" -%} +#!/usr/bin/env bash +{%- else -%} #!/usr/bin/env sh +{%- endif %} {% include 'partials/license.j2' %} # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but diff --git a/docker_templates/partials/license.j2 b/docker_templates/partials/license.j2 index affaabf52..80dc5feef 100644 --- a/docker_templates/partials/license.j2 +++ b/docker_templates/partials/license.j2 @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py" +# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py" # # PLEASE DO NOT EDIT IT DIRECTLY. # ------------------------------------------------------------------------------ diff --git a/docker_templates/ubuntu.Dockerfile.j2 b/docker_templates/ubuntu.Dockerfile.j2 index a74e892a6..05dac147a 100644 --- a/docker_templates/ubuntu.Dockerfile.j2 +++ b/docker_templates/ubuntu.Dockerfile.j2 @@ -43,5 +43,5 @@ ENV JAVA_VERSION {{ java_version }} {% endif %} {% include 'partials/version-check.j2' %} COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["{{ shebang }}", "/__cacert_entrypoint.sh"] -{% include 'partials/jshell.j2' %} +ENTRYPOINT ["/__cacert_entrypoint.sh"] +{% include 'partials/jshell.j2' %} \ No newline at end of file diff --git a/generate_dockerfiles.py b/generate_dockerfiles.py index 434adc0e7..d4007cd1d 100644 --- a/generate_dockerfiles.py +++ b/generate_dockerfiles.py @@ -74,7 +74,6 @@ def archHelper(arch, os_name): directory = configuration["directory"] architectures = configuration["architectures"] os_name = configuration["os"] - shebang = configuration.get("shebang", "") base_image = configuration["image"] deprecated = configuration.get("deprecated", None) versions = configuration.get( @@ -163,7 +162,6 @@ def archHelper(arch, os_name): arch_data=arch_data, os_family=os_family, os=os_name, - shebang=shebang, ) print("Writing Dockerfile to", output_directory) @@ -182,7 +180,7 @@ def archHelper(arch, os_name): template_entrypoint = env.get_template(template_entrypoint_file) entrypoint = template_entrypoint.render( - os=os_name + os=os_name, ) with open(