diff --git a/server/build-docker.sh b/server/build-docker.sh index cc7a597a..79e1fcf2 100755 --- a/server/build-docker.sh +++ b/server/build-docker.sh @@ -44,11 +44,11 @@ for request in $REQUESTED; do INSTALL="android $request" ;; windows) - # skip building winsdk-2022 because wine image contains newer Clang. + # skip building winsdk-2022 because wine image contains newer Clang. INSTALL="wine winsdk-2022_144435207" ;; xbox) - INSTALL="wine winsdk-2022_144435207 xbox-251001" + INSTALL="wine winsdk-2022_144435207 xbox-251002" ;; linux) INSTALL="linux" diff --git a/server/configs/application-local-dev-app.yml b/server/configs/application-local-dev-app.yml index 67b25d97..2ddf2163 100644 --- a/server/configs/application-local-dev-app.yml +++ b/server/configs/application-local-dev-app.yml @@ -35,8 +35,8 @@ extender: winsdk-2022: url: http://winsdk-2022:9000 instanceId: winsdk-2022 - xbox-251001: - url: http://xbox-251001:9000 - instanceId: xbox-251001 + xbox-251002: + url: http://xbox-251002:9000 + instanceId: xbox-251002 logging.pattern.level: "%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]" diff --git a/server/configs/application-test-app.yml b/server/configs/application-test-app.yml index 0af346c0..c3b8ac59 100644 --- a/server/configs/application-test-app.yml +++ b/server/configs/application-test-app.yml @@ -31,8 +31,8 @@ extender: winsdk-2022: url: http://winsdk-2022:9000 instanceId: winsdk-2022 - xbox-251001: - url: http://xbox-251001:9000 - instanceId: xbox-251001 + xbox-251002: + url: http://xbox-251002:9000 + instanceId: xbox-251002 logging.pattern.level: "%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]" diff --git a/server/docker/Dockerfile.xbox.251002-env b/server/docker/Dockerfile.xbox.251002-env new file mode 100644 index 00000000..9c4c8ce5 --- /dev/null +++ b/server/docker/Dockerfile.xbox.251002-env @@ -0,0 +1,17 @@ +FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022-env:latest + +ENV XBOX_SDK_VERSION=251002 +ENV XBOX_SDK=${PLATFORMSDK_DIR}/xbox-sdk-${XBOX_SDK_VERSION} + +ENV XBOX_SDK_FILENAME=xbox-gdk-${XBOX_SDK_VERSION}.tar.gz + +ENV GameDKCoreLatest=${XBOX_SDK} +ENV GameDKLatest=${XBOX_SDK} +ENV GameDKXboxLatest=${XBOX_SDK} +ENV GRDKLatest=${XBOX_SDK}/GRDK +ENV GXDKLatest=${XBOX_SDK}/GXDK + +RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \ + echo "XBox ${XBOX_SDK_FILENAME}" && \ + mkdir -p ${XBOX_SDK} && \ + wget -q -O - $(cat /run/secrets/DM_PACKAGES_URL)/${XBOX_SDK_FILENAME} | tar xz -C ${XBOX_SDK} --strip-components=1 diff --git a/server/docker/docker-compose.yml b/server/docker/docker-compose.yml index d3b5d705..28b2a183 100644 --- a/server/docker/docker-compose.yml +++ b/server/docker/docker-compose.yml @@ -188,13 +188,13 @@ services: default: aliases: - winsdk-2022_144435207 - xbox_251001-dev: - image: europe-west1-docker.pkg.dev/extender-426409/extender-xbox-private-registry/extender-xbox-251001-env:latest + xbox_251002-dev: + image: europe-west1-docker.pkg.dev/extender-426409/extender-xbox-private-registry/extender-xbox-251002-env:latest extends: file: common-services.yml service: remote_builder environment: - - INSTANCE_ID=xbox-251001-local + - INSTANCE_ID=xbox-251002-local profiles: - all - consoles @@ -202,7 +202,7 @@ services: networks: default: aliases: - - xbox-251001 + - xbox-251002 # services for integration testing frontend-integration-test: diff --git a/server/docker/prometheus-scrape.yml b/server/docker/prometheus-scrape.yml index a553499e..a9671e38 100644 --- a/server/docker/prometheus-scrape.yml +++ b/server/docker/prometheus-scrape.yml @@ -15,4 +15,4 @@ scrape_configs: - ps4-12500:9000 - ps5-12000:9000 - winsdk-2022:9000 - - xbox-251001:9000 + - xbox-251002:9000