Added new PS4/PS5 dockerfiles

Author: ekharkunov

server/build-docker.sh

@@ -28,10 +28,10 @@ for request in $REQUESTED; do
             INSTALL="emsdk-3155 emsdk-3165 emsdk-406"
             ;;
         ps4)
-            INSTALL="wine ps4-12000"
+            INSTALL="wine ps4-12000 ps4-12500"
             ;;
         ps5)
-            INSTALL="wine ps5-10000"
+            INSTALL="wine ps5-10000 ps5-12000"
             ;;
         nintendo)
             INSTALL="wine nssdk-1832"

server/configs/application-local-dev-app.yml

@@ -26,12 +26,12 @@ extender:
             nssdk-1832:
                 url: http://nssdk-1832:9000
                 instanceId: nssdk-1832
-            ps4-12000:
-                url: http://ps4-12000:9000
-                instanceId: ps4-12000
-            ps5-10000:
-                url: http://ps5-10000:9000
-                instanceId: ps5-10000
+            ps4-12500:
+                url: http://ps4-12500:9000
+                instanceId: ps4-12500
+            ps5-12000:
+                url: http://ps5-12000:9000
+                instanceId: ps5-12000
             winsdk-2022:
                 url: http://winsdk-2022:9000
                 instanceId: winsdk-2022

server/configs/application-test-app.yml

@@ -22,12 +22,12 @@ extender:
             nssdk-1832:
                 url: http://nssdk-1832:9000
                 instanceId: nssdk-1832
-            ps4-12000:
-                url: http://ps4-12000:9000
-                instanceId: ps4-12000
-            ps5-10000:
-                url: http://ps5-10000:9000
-                instanceId: ps5-10000
+            ps4-12500:
+                url: http://ps4-12500:9000
+                instanceId: ps4-12500
+            ps5-12000:
+                url: http://ps5-12000:9000
+                instanceId: ps5-12000
             winsdk-2022:
                 url: http://winsdk-2022:9000
                 instanceId: winsdk-2022

server/docker/Dockerfile.ps4.12500-env

@@ -0,0 +1,11 @@
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.5.0
+
+ENV PS4_SDK_VERSION=12.500
+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

server/docker/Dockerfile.ps5.12000-env

@@ -0,0 +1,11 @@
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.5.0
+
+ENV PS5_SDK_VERSION=12.000
+ENV PS5_SDK=${PLATFORMSDK_DIR}/ps5-sdk-${PS5_SDK_VERSION}
+
+ENV PS5_SDK_FILENAME=ps5-sdk-${PS5_SDK_VERSION}.tar.gz
+
+RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \
+  echo "PS5 ${PS5_SDK_FILENAME}" && \
+  mkdir -p ${PS5_SDK} && \
+  wget -q -O - $(cat /run/secrets/DM_PACKAGES_URL)/${PS5_SDK_FILENAME} | tar xz -C ${PS5_SDK} --strip-components=1

server/docker/docker-compose.yml

@@ -129,36 +129,36 @@ 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
+  ps4_12500-dev:
+    image: europe-west1-docker.pkg.dev/extender-426409/extender-ps4-private-registry/extender-ps4-12500-env:latest
     extends:
       file: common-services.yml
       service: remote_builder
     environment:
-      - INSTANCE_ID=ps4-12000-local
+      - INSTANCE_ID=ps4-12500-local
     profiles:
       - all
       - consoles
       - playstation
     networks:
       default:
         aliases:
-          - ps4-12000
-  ps5_10000-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-ps5-private-registry/extender-ps5-10000-env:latest
+          - ps4-12500
+  ps5_12000-dev:
+    image: europe-west1-docker.pkg.dev/extender-426409/extender-ps5-private-registry/extender-ps5-12000-env:latest
     extends:
       file: common-services.yml
       service: remote_builder
     environment:
-      - INSTANCE_ID=ps5-10000-local
+      - INSTANCE_ID=ps5-12000-local
     profiles:
       - all
       - consoles
       - playstation
     networks:
       default:
         aliases:
-          - ps5-10000
+          - ps5-12000
   win_2022-dev:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022-env:latest
     extends: