From a16a2bed48365aeccaf50b4a025e1bc8d628dca6 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 18 Mar 2017 14:25:11 -0400 Subject: [PATCH 01/15] Add basic readme --- README.md | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6362937..7882b89 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,40 @@ -# Containers -Generic docker containers designed to work with Pterodactyl Panel and its daemon. +[![Logo Image](https://cdn.pterodactyl.io/logos/Banner%20Logo%20Black@2x.png)](https://pterodactyl.io) + +This repository contains generic [Docker](https://docker.com) images that are used by Pterodactyl Panel to run games. With the release of `v0.6.0` of our panel, we have moved to making the install process be a completely seperate part of the process, making it much easier to maintain a smaller set of Dockerfiles. + +Our goal here is to maintain images that can run a wide variety of games in individual branches. For example, the [`java` branch](https://github.com/Pterodactyl/Containers/tree/java) is a standardized Docker container running on Alpine Linix that should support most all Minecraft based games, as well as java based games. We install all of the required dependencies that we ae aware of, but if you notice one missing, we welcome you to either raise an issue in here, or submit a PR to add it. + +The `entrypoint.sh` files **should not do any application installing**, and exist solely to parse startup commands passed to the container, and then run them, with a pause at the beginning to allow the Daemon time to boot and attach to the container. + +## Current Containers +[`java`](https://github.com/Pterodactyl/Containers/tree/java) + +[`source`](https://github.com/Pterodactyl/Containers/tree/source) + +## Contributing +We welcome any contributions you might have. Please follow our formatting for Dockerfiles, which involves minimizing the number of layers, as well as the size of the container. If possible, please stick to Alpine Linux based images, however we do make use of `ubuntu:16.04` in the [`source` branch](https://github.com/Pterodactyl/Containers/tree/source) due to Source Engine limitations, and reducing the conflicts that might arise. + +## License +``` +MIT License + +Copyright (c) 2017 Pterodactyl Software + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` From 6ef01e33d1ff2bf5c0d8476b097a9307d62e67a5 Mon Sep 17 00:00:00 2001 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> Date: Fri, 9 Feb 2018 16:26:15 +0200 Subject: [PATCH 02/15] Make some changes to README.md (#11) * Make some changes to README.md - Edited the "Current Containers" section so it doesn't have to be always updated - Fixed a typo - Bumped the copyright year. * bump license year in LICENSE too * show only active branches (will omit master from the list) * Add a dot at the end of the sentence. * They are images, not containers --- LICENSE | 2 +- README.md | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index 86162da..6401b21 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Pterodactyl +Copyright (c) 2017-2018 Pterodactyl Software Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 7882b89..9968072 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,12 @@ This repository contains generic [Docker](https://docker.com) images that are used by Pterodactyl Panel to run games. With the release of `v0.6.0` of our panel, we have moved to making the install process be a completely seperate part of the process, making it much easier to maintain a smaller set of Dockerfiles. -Our goal here is to maintain images that can run a wide variety of games in individual branches. For example, the [`java` branch](https://github.com/Pterodactyl/Containers/tree/java) is a standardized Docker container running on Alpine Linix that should support most all Minecraft based games, as well as java based games. We install all of the required dependencies that we ae aware of, but if you notice one missing, we welcome you to either raise an issue in here, or submit a PR to add it. +Our goal here is to maintain images that can run a wide variety of games in individual branches. For example, the [`java` branch](https://github.com/Pterodactyl/Containers/tree/java) is a standardized Docker container running on Alpine Linux that should support most all Minecraft based games, as well as java based games. We install all of the required dependencies that we ae aware of, but if you notice one missing, we welcome you to either raise an issue in here, or submit a PR to add it. The `entrypoint.sh` files **should not do any application installing**, and exist solely to parse startup commands passed to the container, and then run them, with a pause at the beginning to allow the Daemon time to boot and attach to the container. -## Current Containers -[`java`](https://github.com/Pterodactyl/Containers/tree/java) - -[`source`](https://github.com/Pterodactyl/Containers/tree/source) +## Current Images +Every branch, except master, is a different image. For a current list of images, check the branch list [here](https://github.com/Pterodactyl/Containers/branches/active). ## Contributing We welcome any contributions you might have. Please follow our formatting for Dockerfiles, which involves minimizing the number of layers, as well as the size of the container. If possible, please stick to Alpine Linux based images, however we do make use of `ubuntu:16.04` in the [`source` branch](https://github.com/Pterodactyl/Containers/tree/source) due to Source Engine limitations, and reducing the conflicts that might arise. @@ -18,7 +16,7 @@ We welcome any contributions you might have. Please follow our formatting for Do ``` MIT License -Copyright (c) 2017 Pterodactyl Software +Copyright (c) 2017-2018 Pterodactyl Software Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From aeac09ca25408544439a1d347bd6e45f2bb3f724 Mon Sep 17 00:00:00 2001 From: Bl4ckSpr4y Date: Sun, 25 Feb 2018 19:58:11 +0200 Subject: [PATCH 03/15] 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 04/15] 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 05/15] 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 06/15] 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 07/15] 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 08/15] 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 09/15] 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 10/15] 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 11/15] 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 12/15] 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 13/15] 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}'` From a25a9588d22a1360f0271abc331e71699063b75b Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 28 Oct 2018 20:12:35 -0700 Subject: [PATCH 14/15] Revert "Add Python3 to the master imagees repo" --- Dockerfile | 20 -------------------- entrypoint.sh | 15 --------------- 2 files changed, 35 deletions(-) delete mode 100644 Dockerfile delete mode 100644 entrypoint.sh diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 1ebc8c7..0000000 --- a/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# ---------------------------------- -# Pterodactyl Core Dockerfile -# Environment: Java (glibc support) -# Minimum Panel Version: 0.6.0 -# ---------------------------------- -FROM python:3-alpine - -LABEL author="Michael Parker" maintainer="docker@parkervcp.com" - -RUN apk add --no-cache --update \ - && adduser -D -h /home/container container - -USER container -ENV USER=container HOME=/home/container - -WORKDIR /home/container - -COPY ./entrypoint.sh /entrypoint.sh - -CMD ["/bin/ash", "/entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh deleted file mode 100644 index 9d0d000..0000000 --- a/entrypoint.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/ash -cd /home/container - -# show python version -python --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 8e74f0eda6a21471f93e18507586061d630fdb11 Mon Sep 17 00:00:00 2001 From: WGOS Date: Fri, 25 Oct 2019 22:01:49 +0300 Subject: [PATCH 15/15] Added Dockerfile and entrypoint to work with Zulu on Debian --- Dockerfile | 21 +++++++++++++++++++++ entrypoint.sh | 17 +++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 Dockerfile create mode 100644 entrypoint.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..8f60612 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +# ---------------------------------- +# Pterodactyl Core Dockerfile +# Environment: Java (glibc support) +# Minimum Panel Version: 0.6.0 +# ---------------------------------- +FROM azul/zulu-openjdk-debian:8 + +LABEL author="WGOS" maintainer="wgos@wgos.org" + +RUN apt update && apt upgrade -y \ + && apt install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ + && 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 new file mode 100644 index 0000000..7eda648 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,17 @@ +#!/bin/bash +cd /home/container + +echo "Running on Debian $(cat /etc/debian_version)" + +# 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}