From b284687cb10e7c73687d53adefe4ebcd7f59f745 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 26 May 2018 09:59:55 -0400 Subject: [PATCH 1/5] adding jq jq is for parsing json properly. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ac59676..b148961 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ FROM frolvlad/alpine-glibc MAINTAINER Pterodactyl Software, RUN apk add --update --no-cache curl ca-certificates openssl libstdc++ \ - && apk add libc++ --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + && apk add libc++ jq --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ && adduser -D -h /home/container container USER container From e306ff5ecb2c27c54844d90ca696ec9f06b550d2 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 6 Jul 2018 17:24:15 -0400 Subject: [PATCH 2/5] added telnet to glibc image This is dumb... Trying out something new. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b148961..2745a4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM frolvlad/alpine-glibc MAINTAINER Pterodactyl Software, -RUN apk add --update --no-cache curl ca-certificates openssl libstdc++ \ +RUN apk add --update --no-cache curl ca-certificates openssl libstdc++ telnet \ && apk add libc++ jq --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ && adduser -D -h /home/container container From 14a1a7377bf1cd748992856bc5a51698a73072f2 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 6 Jul 2018 17:25:30 -0400 Subject: [PATCH 3/5] adding correct package uses busybox-extras to get telnet. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2745a4c..8bdce90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM frolvlad/alpine-glibc MAINTAINER Pterodactyl Software, -RUN apk add --update --no-cache curl ca-certificates openssl libstdc++ telnet \ +RUN apk add --update --no-cache curl ca-certificates openssl libstdc++ busybox-extras \ && apk add libc++ jq --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ && adduser -D -h /home/container container From aa908c715a3d0356c0a140fe73ef848b905d510d Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 13 Jul 2018 16:16:15 -0400 Subject: [PATCH 4/5] Fix Maintainer Deprecation --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8bdce90..886c412 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ # ---------------------------------- FROM frolvlad/alpine-glibc -MAINTAINER Pterodactyl Software, +LABEL author="Pterodactyl Software" maintainer="support@pterodactyl.io" RUN apk add --update --no-cache curl ca-certificates openssl libstdc++ busybox-extras \ && apk add libc++ jq --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ @@ -15,5 +15,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh -CMD ["/bin/ash", "/entrypoint.sh"] +COPY ./entrypoint.sh /entrypoint.sh +CMD ["/bin/ash", "/entrypoint.sh"] From a4710dedf15b619f351a1e0a4b41001e71283196 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 6 Oct 2018 10:22:42 -0400 Subject: [PATCH 5/5] adding binutils for addr2line This is required for factorio crash reports apparently --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 886c412..bc1dcc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM frolvlad/alpine-glibc LABEL author="Pterodactyl Software" maintainer="support@pterodactyl.io" -RUN apk add --update --no-cache curl ca-certificates openssl libstdc++ busybox-extras \ +RUN apk add --update --no-cache curl ca-certificates openssl libstdc++ busybox-extras binutils \ && apk add libc++ jq --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ && adduser -D -h /home/container container