diff --git a/Jenkinsfile b/Jenkinsfile index 6399e0a..c561159 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -93,6 +93,7 @@ pipeline { #!/bin/bash docker build -t git.zontreck.com/ariascreations/yolks:jdk8 java/8 + docker build -t git.zontreck.com/ariascreations/yolks:jdk11 java/11 ''' } } @@ -109,6 +110,7 @@ pipeline { #!/bin/bash docker push git.zontreck.com/ariascreations/yolks:jdk8 + docker push git.zontreck.com/ariascreations/yolks:jdk11 ''' } } diff --git a/build.sh b/build.sh index b52ef3d..1be4419 100755 --- a/build.sh +++ b/build.sh @@ -12,4 +12,5 @@ docker build -t git.zontreck.com/ariascreations/yolks:dart_stable dart/stable docker build -t git.zontreck.com/ariascreations/yolks:dart_3.3 dart/3.3 # Build java containers -docker build -t git.zontreck.com/ariascreations/yolks:jdk8 java/8 \ No newline at end of file +docker build -t git.zontreck.com/ariascreations/yolks:jdk8 java/8 +docker build -t git.zontreck.com/ariascreations/yolks:jdk11 java/11 \ No newline at end of file diff --git a/java/11/Dockerfile b/java/11/Dockerfile new file mode 100644 index 0000000..fde9446 --- /dev/null +++ b/java/11/Dockerfile @@ -0,0 +1,16 @@ +FROM git.zontreck.com/ariascreations/yolks:debian + +LABEL type="OpenJDK 11" + +USER root +RUN apt-get install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 zip unzip + +# Install OpenJDK 8 +RUN apt-get install -y openjdk-11-jdk + +USER container +COPY --chown=container:container ./entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +ENTRYPOINT ["/bin/bash", "-c", "--"] +CMD ["/entrypoint.sh"] \ No newline at end of file diff --git a/java/11/entrypoint.sh b/java/11/entrypoint.sh new file mode 100644 index 0000000..5a24865 --- /dev/null +++ b/java/11/entrypoint.sh @@ -0,0 +1,26 @@ + +# Default the TZ environment variable to UTC. +TZ=${TZ:-UTC} +export TZ + +# Set environment variable that holds the Internal Docker IP +INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') +export INTERNAL_IP + +# Switch to the container's working directory +cd /home/container || exit 1 + +# Print Java version +printf "\033[1m\033[33mcontainer@ariaos~ \033[0mjava -version\n" +java -version + +# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell +# variable format of "${VARIABLE}" before evaluating the string and automatically +# replacing the values. +PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g') + +# Display the command we're running in the output, and then execute it with eval +printf "\033[1m\033[33mcontainer@ariaos~ \033[0m" +echo "$PARSED" +# shellcheck disable=SC2086 +eval "$PARSED" \ No newline at end of file