From 9d256f43b3ff70a0fcac1208ffaf04e02fdd2e01 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 18 Mar 2017 20:15:05 -0400 Subject: [PATCH 01/15] Add glibc support --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d98782..65252b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # ---------------------------------- # Pterodactyl Core Dockerfile -# Environment: Java +# Environment: Java (glibc support) # Minimum Panel Version: 0.6.0 # ---------------------------------- -FROM java:openjdk-8-jre-alpine +FROM frolvlad/alpine-oraclejdk8:cleaned MAINTAINER Pterodactyl Software, From ec7e4425a32121691fc13726189debd201a9a3c3 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 25 Apr 2017 10:16:11 -0400 Subject: [PATCH 02/15] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 65252b9..7b6d42c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ MAINTAINER Pterodactyl Software, RUN apk update \ && apk upgrade \ - && apk add --no-cache --update curl ca-certificates openssl git tar bash \ + && apk add --no-cache --update curl ca-certificates openssl git tar bash sqlite \ && adduser -D -h /home/container container USER container From ce771b8866ca1863fbc081cdd4e1fecce360867a Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 9 Oct 2017 23:09:17 -0500 Subject: [PATCH 03/15] Add support for accessing internal IP Pterodactyl/Panel#613 --- Dockerfile | 3 +-- entrypoint.sh | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b6d42c..5791b14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,7 @@ RUN apk update \ && adduser -D -h /home/container container USER container -ENV USER container -ENV HOME /home/container +ENV USER=container HOME=/home/container WORKDIR /home/container diff --git a/entrypoint.sh b/entrypoint.sh index 65e5c30..d344b70 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,11 +1,14 @@ #!/bin/bash -sleep 5 +sleep 2 cd /home/container # Output Current Java Version java -version +# Make internal Docker IP address available to processes. +export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` + # Replace Startup Variables MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` echo ":/home/container$ ${MODIFIED_STARTUP}" From c705b6fc61e28df5aab87e8790b086ee01d535ae Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 6 Jan 2018 14:55:21 -0600 Subject: [PATCH 04/15] cleaner output --- entrypoint.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index d344b70..9f9e478 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -14,9 +14,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' echo ":/home/container$ ${MODIFIED_STARTUP}" # Run the Server -${MODIFIED_STARTUP} - -if [ $? -ne 0 ]; then - echo "PTDL_CONTAINER_ERR: There was an error while attempting to run the start command." - exit 1 -fi +eval ${MODIFIED_STARTUP} From ae7aa977be1a6c61a58fa2627365c6109438ff0e Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 6 Jan 2018 14:56:10 -0600 Subject: [PATCH 05/15] dont sleep --- entrypoint.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 9f9e478..5db6cc5 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,4 @@ #!/bin/bash -sleep 2 - cd /home/container # Output Current Java Version From 87ee3696ee964b4773e11c027b11d64602934769 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 26 Feb 2018 23:45:34 -0500 Subject: [PATCH 06/15] updating image --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5791b14..3aae382 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,7 @@ FROM frolvlad/alpine-oraclejdk8:cleaned MAINTAINER Pterodactyl Software, -RUN apk update \ - && apk upgrade \ - && apk add --no-cache --update curl ca-certificates openssl git tar bash sqlite \ +RUN apk add --no-cache --update curl ca-certificates openssl git tar bash sqlite \ && adduser -D -h /home/container container USER container From 008a9d4f908ee4912b289e7791a4e80ed81c473d Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 28 Apr 2018 09:23:49 -0400 Subject: [PATCH 07/15] package update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6cef411..57c48ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM openjdk:8-jdk-alpine MAINTAINER Pterodactyl Software, -RUN apk add --no-cache --update curl ca-certificates openssl git tar bash sqlite \ +RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite \ && adduser -D -h /home/container container USER container From bbd6cade27ac068678c9f17bbcb0d9da2439c806 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 13 Jul 2018 16:15:45 -0400 Subject: [PATCH 08/15] Fix Maintainer Deprecation --- Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 57c48ca..f99aa88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,18 +3,18 @@ # Environment: Java # Minimum Panel Version: 0.6.0 # ---------------------------------- -FROM openjdk:8-jdk-alpine +FROM openjdk:8-jdk-alpine -MAINTAINER Pterodactyl Software, +LABEL author="Pterodactyl Software" maintainer="support@pterodactyl.io" -RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite \ - && adduser -D -h /home/container container +RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite \ + && adduser -D -h /home/container container -USER container -ENV USER=container HOME=/home/container +USER container +ENV USER=container HOME=/home/container -WORKDIR /home/container +WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] From 91ceefa5c317bab126ee08f3036c5d2f3f8dee94 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 5 Oct 2018 23:15:59 -0400 Subject: [PATCH 09/15] adding fontconfig --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f99aa88..4f5c199 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM openjdk:8-jdk-alpine LABEL author="Pterodactyl Software" maintainer="support@pterodactyl.io" -RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite \ +RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig \ && adduser -D -h /home/container container USER container From 0f094dd8eb2f9da9ece1f58180e1565f6e2ddb38 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 3 Mar 2019 19:22:01 -0500 Subject: [PATCH 10/15] add tzdata to openjdk image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4f5c199..13dbfca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM openjdk:8-jdk-alpine LABEL author="Pterodactyl Software" maintainer="support@pterodactyl.io" -RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig \ +RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ && adduser -D -h /home/container container USER container From 3c5fcecb4a1733999c4eb18bb0a79ff19611257e Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 3 Mar 2019 19:44:59 -0500 Subject: [PATCH 11/15] fix timezones for java on alpine --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 13dbfca..49ae4f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ FROM openjdk:8-jdk-alpine LABEL author="Pterodactyl Software" maintainer="support@pterodactyl.io" RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ - && adduser -D -h /home/container container + && adduser -D -h /home/container container \ + && ln -s /etc/localtime /etc/timezone USER container ENV USER=container HOME=/home/container From ebd31f6afd69b6a1c213413cc7c0bdd181de2f9e Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 3 Mar 2019 19:54:03 -0500 Subject: [PATCH 12/15] update to use the new frolvlad images Use frolvlads new images. Also fixes stupid java timezone issues. --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3aae382..a5871fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,12 +3,13 @@ # Environment: Java (glibc support) # Minimum Panel Version: 0.6.0 # ---------------------------------- -FROM frolvlad/alpine-oraclejdk8:cleaned +FROM frolvlad/alpine-java:jre8-cleaned MAINTAINER Pterodactyl Software, -RUN apk add --no-cache --update curl ca-certificates openssl git tar bash sqlite \ - && adduser -D -h /home/container container +RUN apk add --no-cache --update curl ca-certificates openssl git tar bash sqlite fontconfig \ + && adduser -D -h /home/container container \ + && ln -s /etc/localtime /etc/timezone USER container ENV USER=container HOME=/home/container From 3b1b2ba4d5a6f8bc20c98ddc915b96ab39734234 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 27 Mar 2019 17:12:38 -0400 Subject: [PATCH 13/15] adding debian based openjdk 8 jre image --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 49ae4f3..db2c489 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,13 +3,13 @@ # Environment: Java # Minimum Panel Version: 0.6.0 # ---------------------------------- -FROM openjdk:8-jdk-alpine +FROM openjdk:8-jre-slim -LABEL author="Pterodactyl Software" maintainer="support@pterodactyl.io" +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ - && adduser -D -h /home/container container \ - && ln -s /etc/localtime /etc/timezone +RUN apt-get update \ + && apt-get install curl ca-certificates openssl git tar sqlite fontconfig tzdata \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container From 123a3d5681d8e0ff3b717516e9a6e0193f1b1819 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 27 Mar 2019 17:32:47 -0400 Subject: [PATCH 14/15] add -y to apt-get command --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index db2c489..1219d67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,8 @@ FROM openjdk:8-jre-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -RUN apt-get update \ - && apt-get install curl ca-certificates openssl git tar sqlite fontconfig tzdata \ +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata \ && useradd -d /home/container -m container USER container From 562c37b83f237606b70acb0f8aa7c14efd33f6eb Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 31 Mar 2019 22:04:00 -0400 Subject: [PATCH 15/15] forgot to add the route2 package --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1219d67..b4b970a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ FROM openjdk:8-jre-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ && useradd -d /home/container -m container USER container