diff --git a/java/11/Dockerfile b/java/11/Dockerfile index 8caf6fb..26f47c8 100644 --- a/java/11/Dockerfile +++ b/java/11/Dockerfile @@ -20,19 +20,20 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11:alpine-jre +FROM --platform=$BUILDPLATFORM openjdk:11-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT -RUN apk add --update --no-cache libstdc++ ca-certificates curl fontconfig git openssl sqlite tar tzdata \ - && adduser -D -h /home/container container +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \ + && useradd -d /home/container -m container USER container 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/java/11j9/Dockerfile b/java/11j9/Dockerfile index 1b179ff..30c36c5 100644 --- a/java/11j9/Dockerfile +++ b/java/11j9/Dockerfile @@ -20,19 +20,20 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:alpine-jre +FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:debianslim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT -RUN apk add --update --no-cache libstdc++ ca-certificates curl fontconfig git openssl sqlite tar tzdata \ - && adduser -D -h /home/container container +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \ + && useradd -d /home/container -m container USER container 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/java/16/Dockerfile b/java/16/Dockerfile index 7e0a9d3..c5fa1e2 100644 --- a/java/16/Dockerfile +++ b/java/16/Dockerfile @@ -20,19 +20,20 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16:alpine-jre +FROM --platform=$BUILDPLATFORM openjdk:16-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT -RUN apk add --update --no-cache libstdc++ ca-certificates curl fontconfig git openssl sqlite tar tzdata \ - && adduser -D -h /home/container container +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \ + && useradd -d /home/container -m container USER container 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/java/16j9/Dockerfile b/java/16j9/Dockerfile index 796bcb5..2114db8 100644 --- a/java/16j9/Dockerfile +++ b/java/16j9/Dockerfile @@ -20,19 +20,20 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:alpine-jre +FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:debianslim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT -RUN apk add --update --no-cache libstdc++ ca-certificates curl fontconfig git openssl sqlite tar tzdata \ - && adduser -D -h /home/container container +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \ + && useradd -d /home/container -m container USER container 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/java/8/Dockerfile b/java/8/Dockerfile index 80860f8..b1d7875 100644 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -20,19 +20,20 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8:alpine-jre +FROM --platform=$BUILDPLATFORM openjdk:8-slim-buster LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT -RUN apk add --update --no-cache libstdc++ ca-certificates curl fontconfig git openssl sqlite tar tzdata \ - && adduser -D -h /home/container container +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \ + && useradd -d /home/container -m container USER container 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/java/8j9/Dockerfile b/java/8j9/Dockerfile index be86baa..3ab85e5 100644 --- a/java/8j9/Dockerfile +++ b/java/8j9/Dockerfile @@ -20,19 +20,20 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8-openj9:alpine-jre +FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8-openj9:debianslim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT -RUN apk add --update --no-cache libstdc++ ca-certificates curl fontconfig git openssl sqlite tar tzdata \ - && adduser -D -h /home/container container +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \ + && useradd -d /home/container -m container USER container 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/java/entrypoint.sh b/java/entrypoint.sh index 81c3e29..012d126 100644 --- a/java/entrypoint.sh +++ b/java/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/bash # # Copyright (c) 2021 Matthew Penner