diff --git a/python/3.10/Containerfile b/python/3.10/Containerfile index 6a180dc6c..29371ae5d 100644 --- a/python/3.10/Containerfile +++ b/python/3.10/Containerfile @@ -20,14 +20,16 @@ # SOFTWARE. # -FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.10-alpine +FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.10-bookworm 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 iproute2 openssl sqlite tar tzdata \ +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -y && apt-get upgrade -y && apt-get install -y ca-certificates curl ffmpeg g++ gcc git iproute2 openssl sqlite tar tzdata \ && adduser -D -h /home/container container USER container @@ -35,4 +37,4 @@ ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh -CMD [ "/bin/ash", "/entrypoint.sh" ] +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/python/3.11/Containerfile b/python/3.11/Containerfile index d87b7b365..325662a07 100644 --- a/python/3.11/Containerfile +++ b/python/3.11/Containerfile @@ -20,14 +20,16 @@ # SOFTWARE. # -FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.11-alpine +FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.11-bookworm 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 iproute2 openssl sqlite tar tzdata \ +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -y && apt-get upgrade -y && apt-get install -y ca-certificates curl ffmpeg g++ gcc git iproute2 openssl sqlite tar tzdata \ && adduser -D -h /home/container container USER container @@ -35,4 +37,4 @@ ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh -CMD [ "/bin/ash", "/entrypoint.sh" ] +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/python/3.12/Containerfile b/python/3.12/Containerfile index de5bc033a..98e833697 100644 --- a/python/3.12/Containerfile +++ b/python/3.12/Containerfile @@ -20,14 +20,16 @@ # SOFTWARE. # -FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.12-alpine +FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.12-bookworm 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 iproute2 openssl sqlite tar tzdata \ +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -y && apt-get upgrade -y && apt-get install -y ca-certificates curl ffmpeg g++ gcc git iproute2 openssl sqlite tar tzdata \ && adduser -D -h /home/container container USER container @@ -35,4 +37,4 @@ ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh -CMD [ "/bin/ash", "/entrypoint.sh" ] +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/python/entrypoint.sh b/python/entrypoint.sh index 5ea652355..eccbf3408 100644 --- a/python/entrypoint.sh +++ b/python/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/bash # # Copyright (c) 2023 Matthew Penner