diff --git a/server/build-docker.sh b/server/build-docker.sh index cc61f311..78a48b19 100755 --- a/server/build-docker.sh +++ b/server/build-docker.sh @@ -48,11 +48,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 63f70e88..fb5c2e5e 100644 --- a/server/configs/application-local-dev-app.yml +++ b/server/configs/application-local-dev-app.yml @@ -35,8 +35,8 @@ extender: winsdk-2022_144435207: url: http://winsdk-2022_144435207:9000 instanceId: winsdk-2022_144435207 - 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 63f70e88..fb5c2e5e 100644 --- a/server/configs/application-test-app.yml +++ b/server/configs/application-test-app.yml @@ -35,8 +35,8 @@ extender: winsdk-2022_144435207: url: http://winsdk-2022_144435207:9000 instanceId: winsdk-2022_144435207 - 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.251001-env b/server/docker/Dockerfile.xbox.251002-env similarity index 96% rename from server/docker/Dockerfile.xbox.251001-env rename to server/docker/Dockerfile.xbox.251002-env index 590a1534..a09bd0c8 100644 --- a/server/docker/Dockerfile.xbox.251001-env +++ b/server/docker/Dockerfile.xbox.251002-env @@ -1,4 +1,4 @@ -ARG XBOX_SDK_VERSION=251001 +ARG XBOX_SDK_VERSION=251002 ARG XBOX_SDK=${PLATFORMSDK_DIR}/xbox-sdk-${XBOX_SDK_VERSION} FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-stage:1.0.0 AS build diff --git a/server/docker/docker-compose.yml b/server/docker/docker-compose.yml index 26fba661..25061e6b 100644 --- a/server/docker/docker-compose.yml +++ b/server/docker/docker-compose.yml @@ -174,13 +174,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 @@ -188,7 +188,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 20403eb9..73326420 100644 --- a/server/docker/prometheus-scrape.yml +++ b/server/docker/prometheus-scrape.yml @@ -15,4 +15,4 @@ scrape_configs: - ps5-12000:9000 - winsdk-2022:9000 - winsdk-2022_144435207:9000 - - xbox-251001:9000 + - xbox-251002:9000