Add files via upload

Author: PhonicUK

AMPDockerFile

@@ -4,37 +4,46 @@ FROM debian:11-slim
 
 ENV AMP_CONTAINER="DOCKER"
 ENV LD_LIBRARY_PATH="./:/opt/cubecoders/amp/:/AMP/"
-ENV LANG="en_US.UTF-8"
 
 RUN mkdir -p /usr/share/man/man1 && \
     dpkg --add-architecture i386 && \
+    export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     apt-get install -y \
+	numactl \
+	gnupg \
+	locales \
+	software-properties-common \
         lib32gcc-s1 \
-        libc++-dev \
+	libc++-dev \
         coreutils \
         inetutils-ping \
         tmux \
         socat \
         unzip \
         wget \
-        procps \
-        libsqlite3-0 \
-        git git-lfs \
-        curl \
-        xz-utils \
-        bzip2 \
-        libzstd1 \
-        libgdiplus \
-        lib32stdc++6 \
-        gdb \
+	procps \
+	libsqlite3-0 \
+	git git-lfs \
+	curl \
+	gdb \
+	xz-utils \
+	bzip2 \
+	libzstd1 \
+	libgdiplus \
+        lib32stdc++6 libc6 libatomic1 libpulse-dev \ 
         lib32z1 libncurses5:i386 libbz2-1.0:i386 libtinfo5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
+    sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+    locale-gen && \
     wget -q https://repo.cubecoders.com/ampinstmgr-latest.tgz && \
     tar -xf ampinstmgr-latest.tgz -C / && \
-    rm ampinstmgr-latest.tgz && \
-    /opt/cubecoders/amp/ampinstmgr --sync-certs
+    rm ampinstmgr-latest.tgz
+
+ENV LANG="en_US.UTF-8"
+ENV LANGUAGE="en_US:en"
+ENV LC_ALL="en_US.UTF-8"
 
 ADD ampstart.sh /
 

AMPDockerFileJava

@@ -5,10 +5,10 @@ FROM cubecoders/ampbase
 RUN mkdir -p /usr/share/man/man1 && \
     apt-get update && \
     apt-get install -y dirmngr software-properties-common apt-transport-https gpg-agent dnsutils gnupg2 curl libcurl4 wget && \
-    wget -qO- https://packages.adoptium.net/artifactory/api/gpg/key/public > /usr/share/keyrings/adoptium.asc && \
-    echo "deb [signed-by=/usr/share/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb bullseye main" > /etc/apt/sources.list.d/adoptium.list && \
+    wget -qO- https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb bullseye main" > /etc/apt/sources.list.d/adoptium.list && \
     apt-get update && \
-    apt-get install -y temurin-8-jdk temurin-17-jdk temurin-18-jdk && \
+    apt-get install -y temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-18-jdk && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     sed -i 's#mozilla/DST_Root_CA_X3.crt#!mozilla/DST_Root_CA_X3.crt#' /etc/ca-certificates.conf && update-ca-certificates

AMPDockerFileMono

@@ -3,7 +3,8 @@ FROM cubecoders/ampbase
 RUN apt-get update && apt-get -y upgrade && \
 	apt-get install -y xvfb mono-complete && \
 	apt-get clean && \
-	rm -rf /var/lib/apt/lists/*
+	rm -rf /var/lib/apt/lists/* && \
+	cert-sync /etc/ssl/certs/ca-certificates.crt
 
 ENTRYPOINT ["/ampstart.sh"]
 CMD []

AMPDockerFilePython3

@@ -1,7 +1,7 @@
 FROM cubecoders/ampbase
 
 RUN apt-get update && apt-get -y upgrade && \
-	apt-get install -y python3 && \
+	apt-get install -y python3-pip && \
 	apt-get clean && \
 	rm -rf /var/lib/apt/lists/*
 

AMPDockerFileWine

@@ -1,7 +1,7 @@
 FROM cubecoders/ampbase
 
 RUN dpkg --add-architecture i386 && apt-get update && apt-get -y upgrade && \
-	apt-get install -y xvfb wine wine32 wine64 wine-binfmt python3 winbind && \
+	apt-get install -y xvfb wine wine32 wine64 wine-binfmt python3 winbind libwine libwine:i386 fonts-wine xauth && \
 	apt-get clean && \
 	rm -rf /var/lib/apt/lists/*
 

ampstart.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "[Info] AMPStart for Docker - v22.08.1"
+echo "[Info] AMPStart for Docker - v22.12.1"
 
 if [ -z "${AMPUSERID}" ]; then
   echo "[Info] This docker image cannot be used directly by itself - it must be started by ampinstmgr"
@@ -14,7 +14,8 @@ if [ "$?" == "0" ]; then
     echo "[Info] AMP user already exists, continuing..."
 else
     echo "[Info] Performing first-time container setup..."
-    useradd -m -d /home/amp -s /bin/bash -c "AMP Process User" -u $AMPUSERID -g $AMPGROUPID amp &> /dev/null
+    groupadd -r -g $AMPGROUPID amp > /dev/null
+    useradd -m -d /home/amp -s /bin/bash -c "AMP Process User" -u $AMPUSERID -g $AMPGROUPID amp > /dev/null
     touch /home/amp/.gitconfig
     chown -R amp:amp /home/amp 2> /dev/null
     usermod -aG tty amp
@@ -23,6 +24,5 @@ else
 fi
 
 ARGS=$@
-exec su -l -c "ampinstmgr --sync-certs" -- amp
-exec su -l -c "cd /AMP; HOME=/home/amp /AMP/AMP_Linux_x86_64 ${ARGS}; exit $?" -- amp
+exec su -l -c "ampinstmgr --sync-certs; cd /AMP; HOME=/home/amp /AMP/AMP_Linux_x86_64 ${ARGS}; exit $?" -- amp
 exit $?

buildDockerBase

@@ -0,0 +1,10 @@
+#!/bin/sh
+docker build --rm -f AMPDockerFile -t cubecoders/ampbase .
+docker build --rm -f AMPDockerFileJava -t cubecoders/ampbase:java .
+docker build --rm -f AMPDockerFileNode -t cubecoders/ampbase:node .
+docker build --rm -f AMPDockerFileXvfb -t cubecoders/ampbase:xvfb .
+docker build --rm -f AMPDockerFilePython3 -t cubecoders/ampbase:python3 .
+docker build --rm -f AMPDockerFileWine -t cubecoders/ampbase:wine .
+docker build --rm -f AMPDockerFileMono -t cubecoders/ampbase:mono .
+
+docker push -a cubecoders/ampbase

updateDockerImages.sh

@@ -3,6 +3,9 @@ mypath=`realpath $0`
 cd `dirname $mypath`
 
 docker pull $(cat AMPDockerFile | grep FROM | cut -f 2 -d ' ')
-./buildDockerBase.sh
+./buildDockerBase
+yes | docker container prune
+yes | docker image prune -a
+yes | docker volume prune
 exit