From aeac09ca25408544439a1d347bd6e45f2bb3f724 Mon Sep 17 00:00:00 2001 From: Bl4ckSpr4y Date: Sun, 25 Feb 2018 19:58:11 +0200 Subject: [PATCH 01/11] Create Dockerfile --- Dockerfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..01f782c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +FROM ubuntu:16.04 + +MAINTAINER mrkrabs, + +RUN apt update \ + && apt upgrade -y \ + && apt install -y libstdc++6 lib32stdc++6 tar curl iproute2 openssl \ + && useradd -d /home/container -m container + +USER container +ENV USER=container HOME=/home/container + +WORKDIR /home/container + +COPY ./entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] From c3d35bd60753ede918db91646832e4b9a0390e87 Mon Sep 17 00:00:00 2001 From: Bl4ckSpr4y Date: Sun, 25 Feb 2018 19:58:37 +0200 Subject: [PATCH 02/11] Create entrypoint.sh --- entrypoint.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 entrypoint.sh diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..bdedfb5 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/bash +sleep 3 + +cd /home/container + +export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` + +MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` +echo ":/home/container$ ${MODIFIED_STARTUP}" + +${MODIFIED_STARTUP} From 5285ad483cd6e4e9a2475b97a85564d8bbf44ad0 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 25 Feb 2018 14:23:55 -0500 Subject: [PATCH 03/11] Backt o master --- Dockerfile | 17 ----------------- entrypoint.sh | 11 ----------- 2 files changed, 28 deletions(-) delete mode 100644 Dockerfile delete mode 100644 entrypoint.sh diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 01f782c..0000000 --- a/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM ubuntu:16.04 - -MAINTAINER mrkrabs, - -RUN apt update \ - && apt upgrade -y \ - && apt install -y libstdc++6 lib32stdc++6 tar curl iproute2 openssl \ - && useradd -d /home/container -m container - -USER container -ENV USER=container HOME=/home/container - -WORKDIR /home/container - -COPY ./entrypoint.sh /entrypoint.sh - -CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh deleted file mode 100644 index bdedfb5..0000000 --- a/entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -sleep 3 - -cd /home/container - -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` - -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` -echo ":/home/container$ ${MODIFIED_STARTUP}" - -${MODIFIED_STARTUP} From f493215bc125d653a529bbfe424170c2801d8068 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 24 Mar 2018 20:29:58 -0400 Subject: [PATCH 04/11] basic python 3.6 support New image for python 3 --- Dockerfile | 20 ++++++++++++++++++++ entrypoint.sh | 15 +++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 Dockerfile create mode 100644 entrypoint.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3be3cee --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +# ---------------------------------- +# Pterodactyl Core Dockerfile +# Environment: Java (glibc support) +# Minimum Panel Version: 0.6.0 +# ---------------------------------- +FROM python:3.6-alpine3.7 + +MAINTAINER Michael Parker, + +RUN apk add --no-cache --update curl ca-certificates openssl git tar bash sqlite \ + && adduser -D -h /home/container container + +USER container +ENV USER=container HOME=/home/container + +WORKDIR /home/container + +COPY ./entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..320f45d --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash +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}" + +# Run the Server +eval ${MODIFIED_STARTUP} \ No newline at end of file From c8207d06ee62175d02bcdedef8b337096d4635fe Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 24 Mar 2018 21:54:15 -0400 Subject: [PATCH 05/11] more python requirements --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3be3cee..4ab0685 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM python:3.6-alpine3.7 MAINTAINER Michael Parker, -RUN 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 make gcc g++ libffi-dev \ && adduser -D -h /home/container container USER container From fc5f6b327ab05d73f6db2f4f0dcc634db8799ca3 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 25 Mar 2018 09:30:52 -0400 Subject: [PATCH 06/11] removing unnecessary things --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4ab0685..bdd8fd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM python:3.6-alpine3.7 MAINTAINER Michael Parker, -RUN apk add --no-cache --update curl ca-certificates openssl git tar make gcc g++ libffi-dev \ +RUN apk add --no-cache --update \ && adduser -D -h /home/container container USER container From 3cdb63f16a5ec06da192f0d1dd1ca35fa5f4bf1c Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 25 Mar 2018 09:40:28 -0400 Subject: [PATCH 07/11] fixing the entrypoint --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 320f45d..00cab62 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/ash cd /home/container # Output Current Java Version From d07941701832cd54b62515f38307cfaddb509e9e Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 27 Mar 2018 08:51:14 -0400 Subject: [PATCH 08/11] fixed entrypoint CMD --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bdd8fd2..81c1c84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,4 +17,4 @@ WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file +CMD ["/bin/ash", "/entrypoint.sh"] \ No newline at end of file From c4375a68c402dca7c0a56287c261dbe4fc4183f8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 13 Jul 2018 16:09:57 -0400 Subject: [PATCH 09/11] Fix Maintainer Deprecation --- Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81c1c84..8d51e9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,18 +3,18 @@ # Environment: Java (glibc support) # Minimum Panel Version: 0.6.0 # ---------------------------------- -FROM python:3.6-alpine3.7 +FROM python:3.6-alpine3.7 -MAINTAINER Michael Parker, +LABEL auhtor="Michael Parker" maintainer="docker@parkervcp.com" -RUN apk add --no-cache --update \ - && adduser -D -h /home/container container +RUN apk add --no-cache --update \ + && 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/ash", "/entrypoint.sh"] \ No newline at end of file +CMD ["/bin/ash", "/entrypoint.sh"] \ No newline at end of file From 175fa9372b3ce5e9d219725fd2376e3f50a1693c Mon Sep 17 00:00:00 2001 From: Exonical Date: Fri, 13 Jul 2018 16:42:38 -0400 Subject: [PATCH 10/11] its fine --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d51e9e..c5897a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ # ---------------------------------- FROM python:3.6-alpine3.7 -LABEL auhtor="Michael Parker" maintainer="docker@parkervcp.com" +LABEL author="Michael Parker" maintainer="docker@parkervcp.com" RUN apk add --no-cache --update \ && adduser -D -h /home/container container @@ -17,4 +17,4 @@ WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh -CMD ["/bin/ash", "/entrypoint.sh"] \ No newline at end of file +CMD ["/bin/ash", "/entrypoint.sh"] From 9a7610cd3d1702f6319d9e790a3dabc07278b053 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 7 Oct 2018 09:12:09 -0400 Subject: [PATCH 11/11] updated python Moved to latest python as a base and changed the entrypoint to show the python version instead of the non-existent java version. --- Dockerfile | 2 +- entrypoint.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c5897a0..1ebc8c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # Environment: Java (glibc support) # Minimum Panel Version: 0.6.0 # ---------------------------------- -FROM python:3.6-alpine3.7 +FROM python:3-alpine LABEL author="Michael Parker" maintainer="docker@parkervcp.com" diff --git a/entrypoint.sh b/entrypoint.sh index 00cab62..9d0d000 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,8 +1,8 @@ #!/bin/ash cd /home/container -# Output Current Java Version -java -version +# show python version +python --version # Make internal Docker IP address available to processes. export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`