From 80bb87e8cbaf829bb2eb216b8fc4bd72b9821502 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 23 Feb 2022 16:02:00 -0500 Subject: [PATCH 1/4] make sure db images use correct entrypoint --- mariadb/10.3/Dockerfile | 2 +- mariadb/10.4/Dockerfile | 2 +- mariadb/10.5/Dockerfile | 2 +- mariadb/10.6/Dockerfile | 2 +- mariadb/10.7/Dockerfile | 2 +- postgres/10/Dockerfile | 2 +- postgres/11/Dockerfile | 2 +- postgres/12/Dockerfile | 2 +- postgres/13/Dockerfile | 2 +- postgres/14/Dockerfile | 2 +- postgres/9/Dockerfile | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mariadb/10.3/Dockerfile b/mariadb/10.3/Dockerfile index ef1ea23..17d80fe 100644 --- a/mariadb/10.3/Dockerfile +++ b/mariadb/10.3/Dockerfile @@ -15,5 +15,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/mariadb/10.4/Dockerfile b/mariadb/10.4/Dockerfile index 5f0193c..83673e0 100644 --- a/mariadb/10.4/Dockerfile +++ b/mariadb/10.4/Dockerfile @@ -15,5 +15,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/mariadb/10.5/Dockerfile b/mariadb/10.5/Dockerfile index f990e81..0bbf825 100644 --- a/mariadb/10.5/Dockerfile +++ b/mariadb/10.5/Dockerfile @@ -15,5 +15,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/mariadb/10.6/Dockerfile b/mariadb/10.6/Dockerfile index e4adf95..ea443ca 100644 --- a/mariadb/10.6/Dockerfile +++ b/mariadb/10.6/Dockerfile @@ -15,5 +15,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/mariadb/10.7/Dockerfile b/mariadb/10.7/Dockerfile index f05b006..667aa81 100644 --- a/mariadb/10.7/Dockerfile +++ b/mariadb/10.7/Dockerfile @@ -15,5 +15,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/postgres/10/Dockerfile b/postgres/10/Dockerfile index 44467e1..1a2c09d 100644 --- a/postgres/10/Dockerfile +++ b/postgres/10/Dockerfile @@ -12,5 +12,5 @@ USER container ENV HOME /home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/postgres/11/Dockerfile b/postgres/11/Dockerfile index 7b0b6a0..4ed6f38 100644 --- a/postgres/11/Dockerfile +++ b/postgres/11/Dockerfile @@ -12,5 +12,5 @@ USER container ENV HOME /home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/postgres/12/Dockerfile b/postgres/12/Dockerfile index ee9075e..e21d236 100644 --- a/postgres/12/Dockerfile +++ b/postgres/12/Dockerfile @@ -12,5 +12,5 @@ USER container ENV HOME /home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/postgres/13/Dockerfile b/postgres/13/Dockerfile index 9d6d418..ed1d229 100644 --- a/postgres/13/Dockerfile +++ b/postgres/13/Dockerfile @@ -12,5 +12,5 @@ USER container ENV HOME /home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/postgres/14/Dockerfile b/postgres/14/Dockerfile index 77c1fee..c41ec76 100644 --- a/postgres/14/Dockerfile +++ b/postgres/14/Dockerfile @@ -12,5 +12,5 @@ USER container ENV HOME /home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/postgres/9/Dockerfile b/postgres/9/Dockerfile index c410d10..fc94f1c 100644 --- a/postgres/9/Dockerfile +++ b/postgres/9/Dockerfile @@ -12,5 +12,5 @@ USER container ENV HOME /home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ../entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] From 1e037c37d1493b8ddb72e4bcb015b82d29dda281 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 12 Mar 2022 18:21:17 +0100 Subject: [PATCH 2/4] feat(wine): Mono 7.1 and HTTPS DL url (#46) --- wine/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wine/entrypoint.sh b/wine/entrypoint.sh index c98e308..3ee92c7 100644 --- a/wine/entrypoint.sh +++ b/wine/entrypoint.sh @@ -64,7 +64,7 @@ if [[ $WINETRICKS_RUN =~ mono ]]; then WINETRICKS_RUN=${WINETRICKS_RUN/mono} if [ ! -f "$WINEPREFIX/mono.msi" ]; then - wget -q -O $WINEPREFIX/mono.msi http://dl.winehq.org/wine/wine-mono/6.4.0/wine-mono-6.4.0-x86.msi + wget -q -O $WINEPREFIX/mono.msi https://dl.winehq.org/wine/wine-mono/7.1.1/wine-mono-7.1.1-x86.msi fi wine msiexec /i $WINEPREFIX/mono.msi /qn /quiet /norestart /log $WINEPREFIX/mono_install.log From 5fd5db9c81f3b3058f50afac5ecbd65cfb209bb9 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sun, 13 Mar 2022 11:46:58 +0100 Subject: [PATCH 3/4] Update ALTV The image was broken , It spit out a error: `[09:00:13][Error] Error loading "libcsharp-module.so", Unix error: /usr/lib/x86_64-linux-gnu/libstdc++.so.6: Version `GLIBCXX_3.4.26' not found (required by /home/container/modules/libcsharp-module.so)` --- games/altv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/altv/Dockerfile b/games/altv/Dockerfile index 0063e6f..a71b4ca 100644 --- a/games/altv/Dockerfile +++ b/games/altv/Dockerfile @@ -11,7 +11,7 @@ RUN useradd -m -d /home/container -s /bin/bash container RUN apt update -y \ && apt upgrade -y \ - && apt install -y gcc g++ libgcc-s1 lib32gcc-s1 gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \ + && apt install -y g++ gcc libgcc-s1 lib32gcc-s1 gdb libstdc++6 libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \ libfontconfig1 libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata \ python3 dnsutils build-essential coreutils jq pcregrep From b99d99e233855e44e4dc22f01f7c9ed78ededa33 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 26 Mar 2022 17:41:49 +0200 Subject: [PATCH 4/4] feat(arma): install tzdata resolves #50 --- games/arma3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/arma3/Dockerfile b/games/arma3/Dockerfile index 922cdb6..49ec2a8 100644 --- a/games/arma3/Dockerfile +++ b/games/arma3/Dockerfile @@ -11,7 +11,7 @@ RUN dpkg --add-architecture i386 \ && apt-get update \ && apt-get upgrade -y \ && apt-get install -y libgcc-10-dev libstdc++-10-dev libtinfo5 lib64z1 libcurl3-gnutls \ - && apt-get install -y libnss-wrapper gettext-base tar curl gcc g++ libc6 libtbb2 lib32z1 lib32gcc1 lib32stdc++6 libsdl2-2.0-0 libsdl2-2.0-0:i386 libtbb2:i386 lib32stdc++6 libtinfo5:i386 libncurses5:i386 libcurl3-gnutls:i386 \ + && apt-get install -y libnss-wrapper gettext-base tar curl gcc g++ libc6 libtbb2 lib32z1 lib32gcc1 lib32stdc++6 libsdl2-2.0-0 libsdl2-2.0-0:i386 libtbb2:i386 lib32stdc++6 libtinfo5:i386 libncurses5:i386 libcurl3-gnutls:i386 tzdata \ && useradd -m -d /home/container -s /bin/bash container \ && touch ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \ && chgrp 0 ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \