Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions server/configs/application-local-dev-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:-}]"
6 changes: 3 additions & 3 deletions server/configs/application-test-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:-}]"
17 changes: 17 additions & 0 deletions server/docker/Dockerfile.xbox.251002-env
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions server/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,21 +188,21 @@ 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
- xbox
networks:
default:
aliases:
- xbox-251001
- xbox-251002

# services for integration testing
frontend-integration-test:
Expand Down
2 changes: 1 addition & 1 deletion server/docker/prometheus-scrape.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ scrape_configs:
- ps4-12500:9000
- ps5-12000:9000
- winsdk-2022:9000
- xbox-251001:9000
- xbox-251002:9000