From 24dd0dd6f37b00e7a5f11abd892263431c3d4dfa Mon Sep 17 00:00:00 2001 From: JCash Date: Sun, 27 Oct 2024 11:34:16 +0100 Subject: [PATCH] Added support for PS4 SDK 12 --- server/build-docker.sh | 2 +- server/docker/Dockerfile.ps4.12000-env | 11 +++++++++++ server/docker/docker-compose.yml | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 server/docker/Dockerfile.ps4.12000-env diff --git a/server/build-docker.sh b/server/build-docker.sh index 67b24c0f..3a91dc64 100755 --- a/server/build-docker.sh +++ b/server/build-docker.sh @@ -23,7 +23,7 @@ for request in $REQUESTED; do INSTALL="wine emsdk-2011 emsdk-3155 emsdk-3165" ;; ps4) - INSTALL="wine ps4-10500 ps4-11000" + INSTALL="wine ps4-10500 ps4-11000 ps4-12000" ;; ps5) INSTALL="wine ps5-8000 ps5-9000" diff --git a/server/docker/Dockerfile.ps4.12000-env b/server/docker/Dockerfile.ps4.12000-env new file mode 100644 index 00000000..8d1be9f0 --- /dev/null +++ b/server/docker/Dockerfile.ps4.12000-env @@ -0,0 +1,11 @@ +FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.2.1 + +ENV PS4_SDK_VERSION=12.000 +ENV PS4_SDK=${PLATFORMSDK_DIR}/ps4-sdk-${PS4_SDK_VERSION} + +ENV PS4_SDK_FILENAME=ps4-sdk-${PS4_SDK_VERSION}.tar.gz + +RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \ + echo "PS4 ${PS4_SDK_FILENAME}" && \ + mkdir -p ${PS4_SDK} && \ + wget -q -O - $(cat /run/secrets/DM_PACKAGES_URL)/${PS4_SDK_FILENAME} | tar xz -C ${PS4_SDK} --strip-components=1 diff --git a/server/docker/docker-compose.yml b/server/docker/docker-compose.yml index 2d96a041..a4b1c7d9 100644 --- a/server/docker/docker-compose.yml +++ b/server/docker/docker-compose.yml @@ -142,6 +142,21 @@ services: default: aliases: - nssdk-1832 + ps4_12000-dev: + image: europe-west1-docker.pkg.dev/extender-426409/extender-ps4-private-registry/extender-ps4-12000-env:latest + extends: + file: common-services.yml + service: remote_builder + environment: + - INSTANCE_ID=ps4-12000-local + profiles: + - all + - consoles + - playstation + networks: + default: + aliases: + - ps4-12000 ps4_11000-dev: image: europe-west1-docker.pkg.dev/extender-426409/extender-ps4-private-registry/extender-ps4-11000-env:latest extends: