Skip to content

Commit 82f6912

Browse files
committed
Renamed build-stage to build-env image
1 parent 9f6b7a8 commit 82f6912

14 files changed

Lines changed: 14 additions & 13 deletions

.github/workflows/docker-env-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
tags:
77
- "android*"
88
- "base*"
9+
- "build*"
910
- "linux*"
1011
- "emsdk*"
1112
- "wine*"
@@ -67,7 +68,7 @@ jobs:
6768
fi
6869
6970
case $PLATFORM in
70-
base|linux)
71+
base|linux|build)
7172
BUILD_PLATFORMS="linux/amd64,linux/arm64"
7273
;;
7374
*)

server/build-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ MULTI_ARCH="linux/amd64"
1818

1919
# base stage image (shared across Dockerfiles)
2020
echo "Base stage image with archs: $MULTI_ARCH"
21-
docker buildx build --load --platform $MULTI_ARCH -t $DOCKER_REGISTRY/extender-base-stage:1.0.0 -t $DOCKER_REGISTRY/extender-base-stage:latest -f $SCRIPT_DIR/docker/Dockerfile.base-stage $SCRIPT_DIR/docker
21+
docker buildx build --load --platform $MULTI_ARCH -t $DOCKER_REGISTRY/extender-build-env:1.0.0 -t $DOCKER_REGISTRY/extender-build-env:latest -f $SCRIPT_DIR/docker/Dockerfile.build-env $SCRIPT_DIR/docker
2222

2323
# base images
2424
echo "Base image with archs: $MULTI_ARCH"

server/docker/Dockerfile.android-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG GRADLE_VERSION=9.1.0
22

3-
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-stage:1.0.0 AS build
3+
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-build-env:1.0.0 AS build
44

55
ARG GRADLE_VERSION
66

server/docker/Dockerfile.android.ndk25-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ARG ANDROID_SDK_HOME=${ANDROID_ROOT}/.android
1414
ARG ANDROID_SDK_BUILD_TOOLS_PATH_34=${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION_34}
1515
ARG ANDROID_SDK_BUILD_TOOLS_PATH_35=${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION_35}
1616

17-
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-stage:1.0.0 AS build
17+
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-build-env:1.0.0 AS build
1818

1919
ARG ANDROID_BUILD_TOOLS_VERSION_34
2020
ARG ANDROID_SDK_VERSION_34

server/docker/Dockerfile.android.ndk25_sdk36-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ARG ANDROID_SDK_HOME=${ANDROID_ROOT}/.android
1414
ARG ANDROID_NDK_BIN_PATH=${ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin
1515
ARG ANDROID_SDK_BUILD_TOOLS_PATH=${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}
1616

17-
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-stage:1.0.0 AS build
17+
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-build-env:1.0.0 AS build
1818

1919
ARG ANDROID_BUILD_TOOLS_VERSION
2020
ARG ANDROID_SDK_VERSION

server/docker/Dockerfile.base-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG DOTNET_ROOT=/opt/dotnet
66
ARG DOTNET_VERSION_FILE=${DOTNET_ROOT}/dotnet_version
77
ARG NUGET_PACKAGES=/tmp/.nuget
88

9-
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-stage:1.0.0 AS build
9+
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-build-env:1.0.0 AS build
1010

1111
ARG PLATFORMSDK_DIR
1212
ARG TARGETARCH

server/docker/Dockerfile.emsdk.406-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG EMSCRIPTEN_BIN=${EMSCRIPTEN_TARGET_DIR}/upstream/emscripten
88

99
ARG EMSCRIPTEN_TEMP_DIR=/var/extender/ems_temp
1010

11-
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-stage:1.0.0 AS build
11+
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-build-env:1.0.0 AS build
1212

1313
ARG EMSCRIPTEN_VERSION
1414
ARG EMSCRIPTEN_TARGET_DIR

server/docker/Dockerfile.nssdk.2143-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG PLATFORMSDK_DIR=/opt/platformsdk
22
ARG NINTENDO_SDK_VERSION=21.4.3
33
ARG NINTENDO_SDK_ROOT=${PLATFORMSDK_DIR}/nx-${NINTENDO_SDK_VERSION}
44

5-
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-stage:1.0.0 AS build
5+
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-build-env:1.0.0 AS build
66

77
ARG NINTENDO_SDK_VERSION
88
ARG NINTENDO_SDK_ROOT

server/docker/Dockerfile.ps4.12500-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG PLATFORMSDK_DIR=/opt/platformsdk
22
ARG PS4_SDK_VERSION=12.500
33
ARG PS4_SDK=${PLATFORMSDK_DIR}/ps4-sdk-${PS4_SDK_VERSION}
44

5-
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-stage:1.0.0 AS build
5+
FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-build-env:1.0.0 AS build
66

77
ARG PS4_SDK_VERSION
88
ARG PS4_SDK

0 commit comments

Comments
 (0)