Skip to content

Commit

Permalink
Update image versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
ekharkunov committed Jan 13, 2025
1 parent 18b5972 commit f11bbc4
Show file tree
Hide file tree
Showing 19 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions server/build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ DOCKER_NINTENDO_PRIVATE_REGISTRY=europe-west1-docker.pkg.dev/extender-426409/ext

# base images
echo "Base image"
DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-base-env:1.3.0 -t $DOCKER_REGISTRY/extender-base-env:latest -f $SCRIPT_DIR/docker/Dockerfile.base-env $SCRIPT_DIR/docker
DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-base-env:1.3.1 -t $DOCKER_REGISTRY/extender-base-env:latest -f $SCRIPT_DIR/docker/Dockerfile.base-env $SCRIPT_DIR/docker
echo "Linux image"
DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-linux-env:latest -f $SCRIPT_DIR/docker/Dockerfile.linux-env $SCRIPT_DIR/docker

Expand Down Expand Up @@ -57,10 +57,10 @@ for request in $REQUESTED; do
DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_NINTENDO_PRIVATE_REGISTRY/extender-${install}-env:latest -f $SCRIPT_DIR/docker/Dockerfile.$(echo $install | sed 's,-,.,')-env $SCRIPT_DIR/docker
;;
wine)
DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-wine-env:1.3.0 -t $DOCKER_REGISTRY/extender-wine-env:latest -f $SCRIPT_DIR/docker/Dockerfile.wine-env $SCRIPT_DIR/docker
DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-wine-env:1.3.1 -t $DOCKER_REGISTRY/extender-wine-env:latest -f $SCRIPT_DIR/docker/Dockerfile.wine-env $SCRIPT_DIR/docker
;;
android)
DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-android-env:1.4.0 -f $SCRIPT_DIR/docker/Dockerfile.android-env $SCRIPT_DIR/docker
DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-android-env:1.4.1 -f $SCRIPT_DIR/docker/Dockerfile.android-env $SCRIPT_DIR/docker
;;
android-ndk*|winsdk-*|emsdk-*)
DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-${install}-env:latest -f $SCRIPT_DIR/docker/Dockerfile.$(echo $install | sed 's,-,.,')-env $SCRIPT_DIR/docker
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.android-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.1

# Technically part of the Android build, but also required by the GradleService.java
# until it can be disabled (e.g. by looking for the existance of GRADLE_USER_HOME)
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.android.ndk25-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-android-env:1.4.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-android-env:1.4.1

#
# Android SDK/NDK
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.emsdk.2011-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.1

#
# EMSCRIPTEN
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.emsdk.3155-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.1

# Ubuntu still seem to use python3 3.8 as default version
RUN \
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.emsdk.3165-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.1

# Ubuntu still seem to use python3 3.8 as default version
RUN \
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.linux-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.1

RUN \
echo "LINUX TOOLS + COMPILER" && \
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.nssdk.1532-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

# Added in version 1.4.4
ENV NINTENDO_SDK_ROOT_15_3_2=${PLATFORMSDK_DIR}/nx-15.3.2
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.nssdk.1753-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

ENV NINTENDO_SDK_ROOT_17_5=${PLATFORMSDK_DIR}/nx-17.5.3
ENV SWITCH_SDK_17_FILENAME=nx64-sdk-17.5.3.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.nssdk.1832-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

ENV NINTENDO_SDK_ROOT_18_3=${PLATFORMSDK_DIR}/nx-18.3.2
ENV SWITCH_SDK_18_FILENAME=nx64-sdk-18.3.2.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.ps4.10500-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

ENV PS4_SDK_10=${PLATFORMSDK_DIR}/ps4-sdk-10.500

Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.ps4.11000-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

ENV PS4_SDK_11_VERSION=11.000
ENV PS4_SDK_11=${PLATFORMSDK_DIR}/ps4-sdk-${PS4_SDK_11_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.ps4.12000-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

ENV PS4_SDK_VERSION=12.000
ENV PS4_SDK=${PLATFORMSDK_DIR}/ps4-sdk-${PS4_SDK_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.ps5.10000-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

ENV PS5_SDK_VERSION=10.000
ENV PS5_SDK=${PLATFORMSDK_DIR}/ps5-sdk-${PS5_SDK_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.ps5.8000-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

ENV PS5_SDK_8_VERSION=8.000
ENV PS5_SDK_8=${PLATFORMSDK_DIR}/ps5-sdk-${PS5_SDK_8_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.ps5.9000-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

ENV PS5_SDK_9_VERSION=9.000
ENV PS5_SDK_9=${PLATFORMSDK_DIR}/ps5-sdk-${PS5_SDK_9_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.wine-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.3.1

# Installation notes: https://wiki.winehq.org/Ubuntu
# TODO: Backup the files as descibed here: https://wiki.winehq.org/Ubuntu
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.winsdk.2019-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

ENV \
PLATFORMSDK_WIN32=$PLATFORMSDK_DIR/Win32 \
Expand Down
2 changes: 1 addition & 1 deletion server/docker/Dockerfile.winsdk.2022-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.0
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.3.1

ENV PLATFORMSDK_WIN32=$PLATFORMSDK_DIR/Win32

Expand Down

0 comments on commit f11bbc4

Please sign in to comment.