From 5fef0ac2a7b7212f956c5a1bbe2b9e8bb0257284 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 25 Nov 2022 18:29:00 -0500 Subject: [PATCH 1/3] update parkertron image --- bot/parkertron/Dockerfile | 7 +++++-- bot/parkertron/entrypoint.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bot/parkertron/Dockerfile b/bot/parkertron/Dockerfile index 87fc60a..5fb62c0 100644 --- a/bot/parkertron/Dockerfile +++ b/bot/parkertron/Dockerfile @@ -2,8 +2,11 @@ FROM --platform=$TARGETOS/$TARGETARCH alpine:3.9 LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -RUN apk add --update --no-cache git curl lua-stdlib lua musl-dev g++ libc-dev tesseract-ocr tesseract-ocr-dev \ - && adduser -D -h /home/container container +ENV DEBIAN_FRONTEND noninteractive + +RUN apt update -y \ + && apt install -y libtesseract-dev \ + && useradd -m -d /home/container container USER container ENV USER=container HOME=/home/container diff --git a/bot/parkertron/entrypoint.sh b/bot/parkertron/entrypoint.sh index 1971986..d0aea75 100644 --- a/bot/parkertron/entrypoint.sh +++ b/bot/parkertron/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/bash cd /home/container # Set environment variable that holds the Internal Docker IP From dca678b143f91932a9feaa2df3d3f998cebeee69 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 26 Nov 2022 09:01:06 -0500 Subject: [PATCH 2/3] update image use the correct base image and add iproute2 --- bot/parkertron/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/parkertron/Dockerfile b/bot/parkertron/Dockerfile index 5fb62c0..19165bb 100644 --- a/bot/parkertron/Dockerfile +++ b/bot/parkertron/Dockerfile @@ -1,11 +1,11 @@ -FROM --platform=$TARGETOS/$TARGETARCH alpine:3.9 +FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" ENV DEBIAN_FRONTEND noninteractive RUN apt update -y \ - && apt install -y libtesseract-dev \ + && apt install -y libtesseract-dev iproute2 \ && useradd -m -d /home/container container USER container From b4d915f6f53cea1129803ce6371b588e23051515 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 26 Nov 2022 09:24:20 -0500 Subject: [PATCH 3/3] update start command --- bot/parkertron/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/parkertron/Dockerfile b/bot/parkertron/Dockerfile index 19165bb..3a8ac57 100644 --- a/bot/parkertron/Dockerfile +++ b/bot/parkertron/Dockerfile @@ -13,4 +13,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"]