Skip to content

Commit

Permalink
fix builderrors
Browse files Browse the repository at this point in the history
  • Loading branch information
gOOvER committed Jan 3, 2025
1 parent 9fa2fa8 commit 624d474
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 61 deletions.
71 changes: 37 additions & 34 deletions bots/sinusbot/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,46 +1,49 @@
FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim

LABEL maintainer="[email protected]>" version="1.0"
LABEL org.opencontainers.image.description "STEAM Proton-GE Image to use with Pelican/Pterodactyl Gamepanel"
LABEL org.opencontainers.image.authors="[email protected]"
LABEL org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
LABEL org.opencontainers.image.licenses=AGPL-3.0-or-later

ENV DEBIAN_FRONTEND noninteractive

# Install Dependencies
# setup apt and install needed packages
ARG DEBIAN_FRONTEND=noninteractive
RUN apt update \
&& apt upgrade -y \
&& apt install -y \
ca-certificates \
less \
locales \
pulseaudio \
python3 \
sudo \
x11vnc \
x11-xkb-utils \
xvfb \
iproute2 \
ffmpeg \
curl \
libasound2 \
libegl1-mesa \
libglib2.0-0 \
libnss3 \
libpci3 \
libpulse0 \
libxcursor1 \
libxslt1.1 \
libx11-xcb1 \
libxkbcommon0 \
tini

RUN curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/youtube-dl \
&& apt -y upgrade

RUN apt -y install \
ca-certificates \
less \
locales \
pulseaudio \
python3 \
sudo \
x11vnc \
x11-xkb-utils \
xvfb \
iproute2 \
ffmpeg \
curl \
libasound2 \
libegl1-mesa \
libglib2.0-0 \
libnss3 \
libpci3 \
libpulse0 \
libxcursor1 \
libxslt1.1 \
libx11-xcb1 \
libxkbcommon0 \
tini

RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp \
&& chmod a+rx /usr/local/bin/youtube-dl

# Set the locale
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8

## Setup user and working directory
RUN useradd -m -d /home/container -s /bin/bash container
Expand Down
53 changes: 31 additions & 22 deletions bots/sogebot/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,35 +1,44 @@
FROM --platform=$BUILDPLATFORM node:18-bookworm-slim
FROM --platform=$BUILDPLATFORM node:22-bookworm-slim

LABEL org.opencontainers.image.authors="[email protected]"
LABEL org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
LABEL org.opencontainers.image.licenses=AGPL-3.0-or-later
LABEL org.opencontainers.image.description "Docker image for Pelican Hosting Panel and Pterodactyl"

Check warning on line 6 in bots/sogebot/Dockerfile

View workflow job for this annotation

GitHub Actions / bot:sogebot

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "LABEL key=value" should be used instead of legacy "LABEL key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

RUN apt update \
&& apt -y upgrade \
&& apt -y install \
ffmpeg \
iproute2 \
git \
sqlite3 \
libsqlite3-dev \
python3 \
python3-dev \
ca-certificates \
dnsutils \
tzdata \
zip \
libnss3 \
libtool \
autoconf \
automake \
g++ libtool \
build-essential
&& apt -y upgrade
RUN apt -y install \
ffmpeg \
iproute2 \
git \
locales \
sqlite3 \
libsqlite3-dev \
python3 \
python3-dev \
ca-certificates \
dnsutils \
tzdata \
zip \
libnss3 \
libtool \
autoconf \
automake \
g++ libtool \
build-essential

RUN useradd -d /home/container -m container

# update npm
RUN npm install npm@latest -g

# Set the locale
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
locale-gen
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8

# add user
RUN useradd -d /home/container -m container
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
Expand Down
11 changes: 6 additions & 5 deletions games/screeps/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM --platform=$TARGETOS/$TARGETARCH mongo:6-jammy
FROM mongo:7-jammy

LABEL author="Torsten Widmann" maintainer="[email protected]"
LABEL org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
LABEL org.opencontainers.image.licenses=MIT
LABEL org.opencontainers.image.authors="[email protected]"
LABEL org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
LABEL org.opencontainers.image.licenses=AGPL-3.0-or-later
LABEL org.opencontainers.image.description "Docker image for Pelican Hosting Panel and Pterodactyl"

Check warning on line 6 in games/screeps/Dockerfile

View workflow job for this annotation

GitHub Actions / games:screeps

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "LABEL key=value" should be used instead of legacy "LABEL key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

RUN apt update \
&& apt -y upgrade
Expand All @@ -28,7 +29,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.n
RUN apt update

RUN apt install -y nodejs
RUN npm install npm@latest -g
#RUN npm install npm@latest -g

## install redis
RUN curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
Expand Down

0 comments on commit 624d474

Please sign in to comment.