Skip to content
Merged
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
2 changes: 1 addition & 1 deletion server/build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ for request in $REQUESTED; do
INSTALL="wine ps5-10000 ps5-12000"
;;
nintendo)
INSTALL="wine nssdk-1832"
INSTALL="wine nssdk-1832 nssdk-2143"
;;
android)
INSTALL="android android-ndk25 android-ndk25_sdk36"
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 @@ -23,9 +23,9 @@ extender:
linux-arm64-latest:
url: http://linux-arm64:9000
instanceId: linux-arm64
nssdk-1832:
url: http://nssdk-1832:9000
instanceId: nssdk-1832
nssdk-2143:
url: http://nssdk-2143:9000
instanceId: nssdk-2143
ps4-12500:
url: http://ps4-12500:9000
instanceId: ps4-12500
Expand Down
6 changes: 3 additions & 3 deletions server/configs/application-test-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ extender:
linux-arm64-latest:
url: http://linux-arm64:9000
instanceId: linux-arm64
nssdk-1832:
url: http://nssdk-1832:9000
instanceId: nssdk-1832
nssdk-2143:
url: http://nssdk-2143:9000
instanceId: nssdk-2143
ps4-12500:
url: http://ps4-12500:9000
instanceId: ps4-12500
Expand Down
10 changes: 10 additions & 0 deletions server/docker/Dockerfile.nssdk.2143-env
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.5.0

ENV NINTENDO_SDK_VERSION=21.4.3
ENV NINTENDO_SDK_ROOT=${PLATFORMSDK_DIR}/nx-${NINTENDO_SDK_VERSION}
ENV SWITCH_SDK_FILENAME=nx64-sdk-${NINTENDO_SDK_VERSION}.tar.gz

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drop version number in environment variable name


RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \
echo "Switch SDK ${NINTENDO_SDK_VERSION}" && \
mkdir -p ${NINTENDO_SDK_ROOT} && \
wget -q -O - $(cat /run/secrets/DM_PACKAGES_URL)/${SWITCH_SDK_FILENAME} | tar xz -C ${NINTENDO_SDK_ROOT}
8 changes: 4 additions & 4 deletions server/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,21 +115,21 @@ services:
default:
aliases:
- emsdk-406
nssdk_1832-dev:
image: europe-west1-docker.pkg.dev/extender-426409/extender-nintendo-private-registry/extender-nssdk-1832-env:latest
nssdk_2143-dev:
image: europe-west1-docker.pkg.dev/extender-426409/extender-nintendo-private-registry/extender-nssdk-2143-env:latest
extends:
file: common-services.yml
service: remote_builder
environment:
- INSTANCE_ID=nssdk-1832-local
- INSTANCE_ID=nssdk-2143-local
profiles:
- all
- consoles
- nintendo
networks:
default:
aliases:
- nssdk-1832
- nssdk-2143
ps4_12500-dev:
image: europe-west1-docker.pkg.dev/extender-426409/extender-ps4-private-registry/extender-ps4-12500-env:latest
extends:
Expand Down