From 9d256f43b3ff70a0fcac1208ffaf04e02fdd2e01 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 18 Mar 2017 20:15:05 -0400 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 ebd31f6afd69b6a1c213413cc7c0bdd181de2f9e Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 3 Mar 2019 19:54:03 -0500 Subject: [PATCH 7/7] 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