Merge pull request #541 from defold/ps4-local-env-sdk12

Added ps4-12000 and ps5-10000 to local docker builds
defold · Oct 28, 2024 · 4c0310c · 4c0310c
2 parents 193ab77 + 1c08a69
commit 4c0310c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 84 deletions.
diff --git a/server/configs/application-local-dev-app.yml b/server/configs/application-local-dev-app.yml
@@ -6,38 +6,23 @@ extender:
                 url: http://android-ndk25:9000
                 instanceId: android-ndk25
                 alwaysOn: true
-            emsdk-2011:
-                url: http://emsdk-2011:9000
-                instanceId: emsdk-2011
-            emsdk-3155:
-                url: http://emsdk-3155:9000
-                instanceId: emsdk-3155
             emsdk-3165:
                 url: http://emsdk-3165:9000
                 instanceId: emsdk-3165
             linux-latest:
                 url: http://linux:9000
                 instanceId: linux
-            nssdk-1532:
-                url: http://10.0.0.3:9000
-                instanceId: nssdk-1532
-            nssdk-1753:
+            nssdk-1832:
                 url: http://10.0.0.4:9000
-                instanceId: nssdk-1753
-            ps4-10500:
-                url: http://ps4-10500:9000
-                instanceId: ps4-10500
-            ps4-11000:
-                url: http://ps4-11000:9000
-                instanceId: ps4-11000
-            ps5-8000:
-                url: http://ps5-8000:9000
-                instanceId: ps5-8000
-            winsdk-2019:
-                url: http://winsdk-2019:9000
-                instanceId: winsdk-2019
+                instanceId: nssdk-1832
+            ps4-12000:
+                url: http://ps4-12000:9000
+                instanceId: ps4-12000
+            ps5-10000:
+                url: http://ps5-10000:9000
+                instanceId: ps5-10000
             winsdk-2022:
                 url: http://winsdk-2022:9000
                 instanceId: winsdk-2022
 
-logging.pattern.level: "%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]"
+logging.pattern.level: "%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]"
diff --git a/server/docker/docker-compose.yml b/server/docker/docker-compose.yml
@@ -97,21 +97,6 @@ services:
       default:
         aliases:
           - emsdk-3165
-  nssdk_1532-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-nintendo-private-registry/extender-nssdk-1532-env:latest
-    extends:
-      file: common-services.yml
-      service: remote_builder
-    environment:
-      - INSTANCE_ID=nssdk-1532-local
-    profiles:
-      - all
-      - consoles
-      - nintendo
-    networks:
-      default:
-        aliases:
-          - nssdk-1532
   nssdk_1753-dev:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-nintendo-private-registry/extender-nssdk-1753-env:latest
     extends:
@@ -172,36 +157,6 @@ services:
       default:
         aliases:
           - ps4-11000
-  ps4_10500-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-ps4-private-registry/extender-ps4-10500-env:latest
-    extends:
-      file: common-services.yml
-      service: remote_builder
-    environment:
-      - INSTANCE_ID=ps4-10500-local
-    profiles:
-      - all
-      - consoles
-      - playstation
-    networks:
-      default:
-        aliases:
-          - ps4-10500
-  ps5_8000-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-ps5-private-registry/extender-ps5-8000-env:latest
-    extends:
-      file: common-services.yml
-      service: remote_builder
-    environment:
-      - INSTANCE_ID=ps5-8000-local
-    profiles:
-      - all
-      - consoles
-      - playstation
-    networks:
-      default:
-        aliases:
-          - ps5-8000
   ps5_9000-dev:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-ps5-private-registry/extender-ps5-9000-env:latest
     extends:
@@ -232,20 +187,6 @@ services:
       default:
         aliases:
           - ps5-10000
-  win_2019-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2019-env:latest
-    extends:
-      file: common-services.yml
-      service: remote_builder
-    environment:
-      - INSTANCE_ID=winsdk-2019-local
-    profiles:
-      - all
-      - windows
-    networks:
-      default:
-        aliases:
-          - winsdk-2019
   win_2022-dev:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022-env:latest
     extends:
@@ -406,4 +347,3 @@ services:
       default:
         aliases:
           - victoriametrics
-