Merge pull request #18 from CubeCoders/wine-testing

feat: refine wine images, fix/refactor ampstart

Author: Greelan

.github/workflows/base.yml

@@ -8,15 +8,15 @@ on:
       - master
     paths:
       - base/**
-      - scripts/ampstart.sh
+      - scripts/base/ampstart.sh
 permissions:    
   contents: read
   packages: write
 
 jobs:
   push:
     if: ${{ github.repository_owner == 'CubeCoders' }}
-    name: "amp:${{ matrix.base }}"
+    name: 'amp:${{ matrix.base }}'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.github/workflows/java.yml

@@ -34,12 +34,12 @@ jobs:
             only_java:
               - 'java/**'
               - '!base/**'
-              - '!scripts/ampstart.sh'
+              - '!scripts/base/ampstart.sh'
 
   build_and_push:
     needs: [check_changes]
     if: ${{ github.repository_owner == 'CubeCoders' && ( (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || (github.event_name == 'push' && needs.check_changes.outputs.only_java == 'true') || github.event_name == 'workflow_dispatch' ) }}
-    name: "amp:java-${{ matrix.java }}"
+    name: 'amp:java-${{ matrix.java }}'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.github/workflows/mono.yml

@@ -34,12 +34,12 @@ jobs:
             only_mono:
               - 'mono/**'
               - '!base/**'
-              - '!scripts/ampstart.sh'
+              - '!scripts/base/ampstart.sh'
 
   build_and_push:
     needs: [check_changes]
     if: ${{ github.repository_owner == 'CubeCoders' && ( (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || (github.event_name == 'push' && needs.check_changes.outputs.only_mono == 'true') || github.event_name == 'workflow_dispatch' ) }}
-    name: "amp:mono-${{ matrix.mono }}"
+    name: 'amp:mono-${{ matrix.mono }}'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.github/workflows/python.yml

@@ -34,7 +34,7 @@ jobs:
             only_python:
               - 'python/**'
               - '!base/**'
-              - '!scripts/ampstart.sh'
+              - '!scripts/base/ampstart.sh'
 
   build_and_push:
     needs: [check_changes]

.github/workflows/wine.yml

@@ -11,6 +11,7 @@ on:
       - master
     paths:
       - wine/**
+      - scripts/wine/**
 
 permissions:
   contents: read
@@ -34,29 +35,60 @@ jobs:
             only_wine:
               - 'wine/**'
               - '!base/**'
-              - '!scripts/ampstart.sh'
+              - '!scripts/base/ampstart.sh'
 
-  build_and_push:
+  build_wine_common:
     needs: [check_changes]
     if: ${{ github.repository_owner == 'CubeCoders' && ( (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || (github.event_name == 'push' && needs.check_changes.outputs.only_wine == 'true') || github.event_name == 'workflow_dispatch' ) }}
-    name: "amp:wine-${{ matrix.wine }}"
+    name: 'amp:wine-common'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        wine:
-          - 9-stable
-          - 10-stable
-          - devel
-          - stable
-          - staging
 
     steps:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_sha || github.sha }}
 
-#     - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: cubecoders
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./wine/common/Dockerfile
+          platforms: linux/amd64,linux/arm64/v8
+          push: true
+          pull: true
+          tags: ghcr.io/cubecoders/amp:wine-common
+          cache-from: type=gha,scope=${{ github.workflow }}-common
+          cache-to: type=gha,mode=max,scope=${{ github.workflow }}-common
+          provenance: mode=max
+          sbom: true
+
+  build_versions:
+    needs: [build_wine_common]
+    name: 'amp:wine-${{ matrix.version }}'
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - stable
+          - devel
+          - staging
+          - 10-stable
+          - 9-stable
+        
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
 
       - uses: docker/login-action@v3
@@ -68,13 +100,15 @@ jobs:
       - uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./wine/${{ matrix.wine }}/Dockerfile
+          file: ./wine/${{ matrix.version }}/Dockerfile
           platforms: linux/amd64,linux/arm64/v8
           push: true
           pull: true
-          tags: ghcr.io/cubecoders/amp:wine-${{ matrix.wine }}
-          cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.wine }}
-          cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.wine }}
+          tags: ghcr.io/cubecoders/amp:wine-${{ matrix.version }}
+          cache-from: |
+            type=gha,scope=${{ github.workflow }}-wine-common
+            type=gha,scope=${{ github.workflow }}-wine-${{ matrix.version }}
+          cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.version }}
           provenance: mode=max
           sbom: true
 

base/debian/Dockerfile

@@ -7,16 +7,15 @@ LABEL       org.opencontainers.image.source="https://github.com/CubeCoders/docke
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         AMP_CONTAINER="DOCKER"
-ENV         LD_LIBRARY_PATH="./:/opt/cubecoders/amp/:/AMP/"
 
-ARG         DEBIAN_FRONTEND=noninteractive
+ARG         DEBIAN_FRONTEND="noninteractive"
 ARG         TARGETARCH
 
 # Update base packages and install dependencies
 RUN         set -eux; \
             mkdir -p /usr/share/man/man1; \
             apt-get update; \
-            apt-get install -y \
+            apt-get install -o APT::Keep-Downloaded-Packages="false" -y \
                 ca-certificates curl wget tar unzip xz-utils bzip2 \
                 coreutils procps iproute2 iputils-ping socat jq git git-lfs gnupg tmux dbus \
                 tini tzdata locales \
@@ -30,63 +29,70 @@ RUN         set -eux; \
                 # Required for Eco
                 libgdiplus \
                 # Required for Pavlov VR (and variously some others)
-                gdb libc++-dev; \    
+                gdb libc++-dev; \
+            \  
             case "$TARGETARCH" in \
                 amd64) \
                     dpkg --add-architecture i386; \
                     apt-get update; \
-                    apt-get install -y \
+                    apt-get install -o APT::Keep-Downloaded-Packages="false" -y \
                         # Required for steamcmd
                         libgcc-s1:i386 \
                         # Others
                         libstdc++6:i386 zlib1g:i386 libbz2-1.0:i386 libcurl4:i386 libcurl3-gnutls:i386 libcurl4-gnutls-dev:i386 \
                         libncurses6:i386 libncurses5:i386 libtinfo6:i386 libtinfo5:i386 libsdl2-2.0-0:i386 libssl3:i386; \
                     ;; \
+                \
                 arm64) \
                     dpkg --add-architecture armhf; \
                     apt-get update; \
-                    apt-get install -y \
+                    apt-get install -o APT::Keep-Downloaded-Packages="false" -y \
                         # Required for steamcmd
                         libgcc-s1:armhf \
                         # Others
                         libstdc++6:armhf zlib1g:armhf libbz2-1.0:armhf libcurl4:armhf libcurl3-gnutls:armhf libcurl4-gnutls-dev:armhf \
                         libncurses6:armhf libncurses5:armhf libtinfo6:armhf libtinfo5:armhf libsdl2-2.0-0:armhf libssl3:armhf; \
+                    \
                     # Add box86/box64
                     install -d -m 0755 /etc/apt/keyrings; \
                     wget -qO- "https://pi-apps-coders.github.io/box86-debs/KEY.gpg" | gpg --dearmor -o /etc/apt/keyrings/box86-archive-keyring.gpg; \
                     printf "Types: deb\nURIs: https://Pi-Apps-Coders.github.io/box86-debs/debian\nSuites: ./\nSigned-By: /etc/apt/keyrings/box86-archive-keyring.gpg" | tee /etc/apt/sources.list.d/box86.sources >/dev/null; \
                     wget -qO- "https://pi-apps-coders.github.io/box64-debs/KEY.gpg" | gpg --dearmor -o /etc/apt/keyrings/box64-archive-keyring.gpg; \
                     printf "Types: deb\nURIs: https://Pi-Apps-Coders.github.io/box64-debs/debian\nSuites: ./\nSigned-By: /etc/apt/keyrings/box64-archive-keyring.gpg" | tee /etc/apt/sources.list.d/box64.sources >/dev/null; \
                     apt-get update; \
-                    apt-get install -y \
+                    apt-get install -o APT::Keep-Downloaded-Packages="false" -y \
                         box86-generic-arm:armhf box64-generic-arm; \
                     ;; \
             esac; \
+            \
             # Temp fix if libssl1.1 needed
-            case "$TARGETARCH" in \
+            case "${TARGETARCH}" in \
                 amd64) wget -qO libssl1.1.deb https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb;; \
                 arm64) wget -qO libssl1.1.deb https://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_arm64.deb;; \
             esac; \
             apt-get install -y ./libssl1.1.deb; \
             rm libssl1.1.deb; \
+            \
             # Install AMP instance manager
-            case "$TARGETARCH" in \
+            case "${TARGETARCH}" in \
                 amd64) wget -q https://cdn-repo.c7rs.com/ampinstmgr-latest.tgz;; \
                 arm64) wget -q https://cdn-repo.c7rs.com/aarch64/ampinstmgr-latest.tgz;; \
             esac; \
             tar -xzf ampinstmgr-latest.tgz -C /; \
             rm ampinstmgr-latest.tgz; \
+            \
             # Set up locales
             sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen; \
             locale-gen; \
+            \
             apt-get clean; \
             rm -rf /var/lib/apt/lists/*
 
-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"
 
-COPY        ./scripts/ampstart.sh /ampstart.sh
+COPY        ./scripts/base/ampstart.sh /ampstart.sh
 RUN         chmod +x /ampstart.sh
 ENTRYPOINT  ["/usr/bin/tini", "-g", "--", "/ampstart.sh"]
 CMD         []

java/lts/Dockerfile

@@ -5,17 +5,19 @@ FROM        ghcr.io/cubecoders/amp:debian
 
 LABEL       org.opencontainers.image.licenses=MIT
 
-ARG         DEBIAN_FRONTEND=noninteractive
+ARG         DEBIAN_FRONTEND="noninteractive"
 
 # Install required packages and Temurin Java LTS versions
 RUN         set -eux; \
             apt-get update; \
             # Add dependencies as per official Adoptium images
-            apt-get install -y --no-install-recommends fontconfig binutils p11-kit; \
+            apt-get install -o APT::Keep-Downloaded-Packages="false" -y --no-install-recommends \
+                fontconfig binutils p11-kit; \
             install -d -m 0755 /etc/apt/keyrings; \
             wget -qO- https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor -o /etc/apt/keyrings/adoptium.gpg; \
             printf 'Types: deb\nURIs: https://packages.adoptium.net/artifactory/deb\nSuites: bookworm\nComponents: main\nSigned-By: /etc/apt/keyrings/adoptium.gpg\n' | tee /etc/apt/sources.list.d/adoptium.sources >/dev/null; \
             apt-get update; \
-            apt-get install -y temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk; \
+            apt-get install -o APT::Keep-Downloaded-Packages="false" -y \
+                temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk; \
             apt-get clean; \
             rm -rf /var/lib/apt/lists/*

mono/latest/Dockerfile

@@ -5,16 +5,20 @@ FROM        ghcr.io/cubecoders/amp:debian
 
 LABEL       org.opencontainers.image.licenses=MIT
 
-ARG         DEBIAN_FRONTEND=noninteractive
+ARG         DEBIAN_FRONTEND="noninteractive"
 
 # Install required packages and Mono
 RUN         set -eux; \
             apt-get update; \
-            apt-get install -y --no-install-recommends dirmngr; \
+            apt-get install -o APT::Keep-Downloaded-Packages="false" -y --no-install-recommends \
+                dirmngr; \
+            \
             install -d -m 0755 /etc/apt/keyrings; \
             gpg --homedir /tmp --no-default-keyring --keyring /etc/apt/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; \
             printf 'Types: deb\nURIs: https://download.mono-project.com/repo/debian\nSuites: stable-buster\nComponents: main\nSigned-By: /etc/apt/keyrings/mono-official-archive-keyring.gpg\n' | tee /etc/apt/sources.list.d/mono-official-stable.sources >/dev/null; \
             apt-get update; \
-            apt-get install -y mono-complete; \
+            apt-get install -o APT::Keep-Downloaded-Packages="false" -y \
+                mono-complete; \
+            \
             apt-get clean; \
             rm -rf /var/lib/apt/lists/*

python/3.11/Dockerfile

@@ -4,14 +4,14 @@
 FROM        ghcr.io/cubecoders/amp:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
-ENV         PIP_DISABLE_PIP_VERSION_CHECK=1
+ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
 
-ARG         DEBIAN_FRONTEND=noninteractive
+ARG         DEBIAN_FRONTEND="noninteractive"
 
 # System Python (3.11) from Debian
 RUN         set -eux; \
             apt-get update; \
-            apt-get install -y --no-install-recommends \
+            apt-get install -o APT::Keep-Downloaded-Packages="false" -y --no-install-recommends \
                 python3 python3-venv python3-pip; \
             apt-get clean; \
             rm -rf /var/lib/apt/lists/*

python/3/Dockerfile

@@ -7,9 +7,7 @@ FROM        python:3.12-slim-bookworm AS py312
 FROM        ghcr.io/cubecoders/amp:python-3.11
 LABEL       org.opencontainers.image.licenses=MIT
 
-ENV         PIP_DISABLE_PIP_VERSION_CHECK=1
-
-ARG         DEBIAN_FRONTEND=noninteractive
+ARG         DEBIAN_FRONTEND="noninteractive"
 
 # Drop in upstream Python 3.10
 COPY        --from=py310 /usr/local/bin/python3.10 /usr/local/bin/
@@ -28,5 +26,5 @@ RUN         set -eux; \
             python3.10 -m pip --no-cache-dir install --upgrade pip setuptools wheel; \
             python3.12 -m pip --no-cache-dir install --upgrade pip setuptools wheel; \
             for shim in python3.10 python3.12 pip3.10 pip3.12; do \
-                ln -sf "/usr/local/bin/$shim" "/usr/bin/$shim"; \
+                ln -sf "/usr/local/bin/${shim}" "/usr/bin/${shim}"; \
             done