diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 0790c1e..8121d77 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -37,7 +37,6 @@ jobs: - "python3.7" - "python3.8" - "python3.9" - #- "python3.10" - "source" - "source-install" diff --git a/README.md b/README.md index 17cbe73..aafceaa 100644 --- a/README.md +++ b/README.md @@ -77,9 +77,6 @@ these images on an arm system, no modification to them or the tag is needed, the - [`python3.9`](https://github.com/matthewpi/images/tree/master/python3.9) - `ghcr.io/matthewpi/images:python3.9` - `quay.io/matthewp/pterodactyl:python3.9` -- [`python3.10`](https://github.com/matthewpi/images/tree/master/python3.10) - - `ghcr.io/matthewpi/images:python3.10` - - `quay.io/matthewp/pterodactyl:python3.10` - [`source`](https://github.com/matthewpi/images/tree/master/source) - `ghcr.io/matthewpi/images:source` - `quay.io/matthewp/pterodactyl:source` diff --git a/alpine/entrypoint.sh b/alpine/entrypoint.sh index 7b62f1b..1ecc9fd 100644 --- a/alpine/entrypoint.sh +++ b/alpine/entrypoint.sh @@ -38,4 +38,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/fivem/entrypoint.sh b/fivem/entrypoint.sh index 7b62f1b..1ecc9fd 100644 --- a/fivem/entrypoint.sh +++ b/fivem/entrypoint.sh @@ -38,4 +38,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/go1.14/entrypoint.sh b/go1.14/entrypoint.sh index 1a50156..6051561 100644 --- a/go1.14/entrypoint.sh +++ b/go1.14/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/go1.15/entrypoint.sh b/go1.15/entrypoint.sh index 1a50156..6051561 100644 --- a/go1.15/entrypoint.sh +++ b/go1.15/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/go1.16/entrypoint.sh b/go1.16/entrypoint.sh index 1a50156..6051561 100644 --- a/go1.16/entrypoint.sh +++ b/go1.16/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/java10/entrypoint.sh b/java10/entrypoint.sh index b17dd93..55ff100 100644 --- a/java10/entrypoint.sh +++ b/java10/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/java11/entrypoint.sh b/java11/entrypoint.sh index b17dd93..55ff100 100644 --- a/java11/entrypoint.sh +++ b/java11/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/java12/entrypoint.sh b/java12/entrypoint.sh index b17dd93..55ff100 100644 --- a/java12/entrypoint.sh +++ b/java12/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/java13/entrypoint.sh b/java13/entrypoint.sh index b17dd93..55ff100 100644 --- a/java13/entrypoint.sh +++ b/java13/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/java14/entrypoint.sh b/java14/entrypoint.sh index b17dd93..55ff100 100644 --- a/java14/entrypoint.sh +++ b/java14/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/java15/entrypoint.sh b/java15/entrypoint.sh index b17dd93..55ff100 100644 --- a/java15/entrypoint.sh +++ b/java15/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/java16/entrypoint.sh b/java16/entrypoint.sh index b17dd93..55ff100 100644 --- a/java16/entrypoint.sh +++ b/java16/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/java7/entrypoint.sh b/java7/entrypoint.sh index b17dd93..55ff100 100644 --- a/java7/entrypoint.sh +++ b/java7/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/java8/entrypoint.sh b/java8/entrypoint.sh index b17dd93..55ff100 100644 --- a/java8/entrypoint.sh +++ b/java8/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/java9/entrypoint.sh b/java9/entrypoint.sh index b17dd93..55ff100 100644 --- a/java9/entrypoint.sh +++ b/java9/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/node12/entrypoint.sh b/node12/entrypoint.sh index 0e09cd6..926c2a1 100644 --- a/node12/entrypoint.sh +++ b/node12/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/node14/entrypoint.sh b/node14/entrypoint.sh index 0e09cd6..926c2a1 100644 --- a/node14/entrypoint.sh +++ b/node14/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/node15/entrypoint.sh b/node15/entrypoint.sh index 0e09cd6..926c2a1 100644 --- a/node15/entrypoint.sh +++ b/node15/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/python3.10/Dockerfile b/python3.10/Dockerfile deleted file mode 100644 index a2e19be..0000000 --- a/python3.10/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2021 Matthew Penner -# -# 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 --platform=$BUILDPLATFORM python:3.10-alpine - -LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" - -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" -LABEL org.opencontainers.image.licenses=MIT - -RUN apk add --update --no-cache ca-certificates curl ffmpeg g++ gcc git openssl sqlite tar tzdata \ - && 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/python3.10/entrypoint.sh b/python3.10/entrypoint.sh deleted file mode 100644 index d840ee7..0000000 --- a/python3.10/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/ash - -# -# Copyright (c) 2021 Matthew Penner -# -# 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. -# - -# Default the TZ environment variable to UTC. -TZ=${TZ:-UTC} -export TZ - -# Switch to the container's working directory -cd /home/container - -# Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` - -# Print Python version -python --version - -# Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` -printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' -echo "${MODIFIED_STARTUP}" - -# Run the startup command -exec ${MODIFIED_STARTUP} diff --git a/python3.7/entrypoint.sh b/python3.7/entrypoint.sh index 6d03550..d157bf6 100644 --- a/python3.7/entrypoint.sh +++ b/python3.7/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -eval ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/python3.8/entrypoint.sh b/python3.8/entrypoint.sh index d840ee7..d157bf6 100644 --- a/python3.8/entrypoint.sh +++ b/python3.8/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/python3.9/entrypoint.sh b/python3.9/entrypoint.sh index d840ee7..d157bf6 100644 --- a/python3.9/entrypoint.sh +++ b/python3.9/entrypoint.sh @@ -41,4 +41,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP} diff --git a/source/entrypoint.sh b/source/entrypoint.sh index e2b3a78..3264527 100644 --- a/source/entrypoint.sh +++ b/source/entrypoint.sh @@ -38,4 +38,4 @@ printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec ${MODIFIED_STARTUP} +exec env ${MODIFIED_STARTUP}