Merge branch 'master' into tini

This commit is contained in:
Quinten
2023-08-09 19:18:11 +02:00
committed by GitHub
5 changed files with 117 additions and 14 deletions

View File

@@ -1,18 +1,50 @@
FROM --platform=$TARGETOS/$TARGETARCH python:3.11-slim-bullseye
FROM --platform=$TARGETOS/$TARGETARCH python:3.11-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN mkdir -p /usr/share/man/man1 \
&& apt update \
&& apt -y install git ca-certificates dnsutils iproute2 wget curl xz-utils git openjdk-11-jre tini \
zlib1g-dev libffi-dev git libmagickwand-dev unzip libaa1-dev build-essential tk-dev libncurses5-dev libncursesw5-dev libreadline6-dev libdb5.3-dev libgdbm-dev libsqlite3-dev libssl-dev libbz2-dev libexpat1-dev liblzma-dev ffmpeg imagemagick \
&& pip install python-forecastio tweepy unidecode discord-text-sanitizer mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil \
&& useradd -m -d /home/container container \
&& mkdir -p /home/container/.config/Red-DiscordBot/ \
&& ln -s /home/container/.config/Red-DiscordBot/ /usr/local/share/Red-DiscordBot
RUN mkdir -p /usr/share/man/man1
RUN apt update \
&& apt -y upgrade \
&& apt -y install \
git \
ca-certificates \
dnsutils \
iproute2 \
wget \
curl \
xz-utils \
openjdk-17-jre-headless \
zlib1g-dev \
libffi-dev \
libmagickwand-dev \
unzip \
libaa1-dev \
build-essential \
tk-dev \
libncurses5-dev \
libncursesw5-dev \
libreadline6-dev \
libdb5.3-dev \
libgdbm-dev \
libsqlite3-dev \
libssl-dev \
libbz2-dev \
libexpat1-dev \
liblzma-dev \
ffmpeg \
imagemagick
RUN pip install --upgrade pip
RUN pip install python-forecastio tweepy unidecode discord-text-sanitizer mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil
RUN mkdir -p /home/container/.config/Red-DiscordBot/
RUN ln -s /home/container/.config/Red-DiscordBot/ /usr/local/share/Red-DiscordBot
## Setup user and working directory
RUN useradd -m -d /home/container -s /bin/bash container
USER container
ENV USER=container HOME=/home/container
ENV USER=container HOME=/home/container
WORKDIR /home/container
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh