Skip to content

Commit

Permalink
Update registries names. Update service accounts according to new pro…
Browse files Browse the repository at this point in the history
…ject.
  • Loading branch information
ekharkunov committed Jun 24, 2024
1 parent 72cedc9 commit 82fb40c
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/application-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

env:
GOOGLE_ARTIFACT_REGISTRY: europe-north1-docker.pkg.dev
MAVEN_SERVICE_ACCOUNT: superb-chamois-registry@extender-poc.iam.gserviceaccount.com
MAVEN_SERVICE_ACCOUNT: hip-terrier-registry@extender-426409.iam.gserviceaccount.com

jobs:
client:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-env-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ on:

env:
GOOGLE_ARTIFACT_REGISTRY: europe-north1-docker.pkg.dev
PUBLIC_REGISTRY: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry
PRIVATE_REGISTRY: europe-north1-docker.pkg.dev/extender-poc/extender-private-registry
PUBLIC_REGISTRY: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry
PRIVATE_REGISTRY: europe-north1-docker.pkg.dev/extender-426409/extender-private-registry
PRIVATE_PLATFORMS: "nssdk ps4 ps5"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publishing {
repositories {
maven {
name "extenderRepo"
url "artifactregistry://europe-north1-maven.pkg.dev/extender-poc/extender-maven/"
url "artifactregistry://europe-north1-maven.pkg.dev/extender-426409/extender-maven/"
}
}
}
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-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env

# 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-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-android-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-android-env

#
# 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-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env

#
# 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-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env

# 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-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env

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-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env

# 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-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env

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.ps4.10500-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env

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-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env

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.ps5.8000-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env

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.wine-env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env

# 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-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-wine-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env

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-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-wine-env
FROM europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env

ENV PLATFORMSDK_WIN32=$PLATFORMSDK_DIR/Win32

Expand Down
40 changes: 20 additions & 20 deletions server/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: extender

services:
frontend-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:latest
extends:
file: common-services.yml
service: common_builder
Expand All @@ -25,7 +25,7 @@ services:
aliases:
- frontend
linux-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-linux-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-linux-env:latest
extends:
file: common-services.yml
service: remote_builder
Expand All @@ -37,7 +37,7 @@ services:
aliases:
- linux
android_ndk25-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-android-ndk25-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-android-ndk25-env:latest
extends:
file: common-services.yml
service: common_builder
Expand All @@ -50,7 +50,7 @@ services:
aliases:
- android-ndk25
emscripten_2011-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-emsdk-2011-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-emsdk-2011-env:latest
extends:
file: common-services.yml
service: remote_builder
Expand All @@ -62,7 +62,7 @@ services:
aliases:
- emscripten-2011
emscripten_3155-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-emsdk-3155-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-emsdk-3155-env:latest
extends:
file: common-services.yml
service: remote_builder
Expand All @@ -74,7 +74,7 @@ services:
aliases:
- emscripten-3155
nssdk_1532-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-private-registry/extender-nssdk-1532-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-private-registry/extender-nssdk-1532-env:latest
extends:
file: common-services.yml
service: remote_builder
Expand All @@ -87,7 +87,7 @@ services:
aliases:
- nssdk-1532
nssdk_1753-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-private-registry/extender-nssdk-1753-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-private-registry/extender-nssdk-1753-env:latest
extends:
file: common-services.yml
service: remote_builder
Expand All @@ -100,7 +100,7 @@ services:
aliases:
- nssdk-1753
ps4_11000-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-private-registry/extender-ps4-11000-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-private-registry/extender-ps4-11000-env:latest
extends:
file: common-services.yml
service: remote_builder
Expand All @@ -113,7 +113,7 @@ services:
aliases:
- ps4-11000
ps4_10500-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-private-registry/extender-ps4-10500-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-private-registry/extender-ps4-10500-env:latest
extends:
file: common-services.yml
service: remote_builder
Expand All @@ -126,7 +126,7 @@ services:
aliases:
- ps4-10500
ps5_8000-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-private-registry/extender-ps5-8000-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-private-registry/extender-ps5-8000-env:latest
extends:
file: common-services.yml
service: remote_builder
Expand All @@ -139,7 +139,7 @@ services:
aliases:
- ps5-8000
win_2019-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-winsdk-2019-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2019-env:latest
extends:
file: common-services.yml
service: remote_builder
Expand All @@ -151,7 +151,7 @@ services:
aliases:
- winsdk-2019
win_2022-dev:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-winsdk-2022-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022-env:latest
extends:
file: common-services.yml
service: remote_builder
Expand All @@ -165,7 +165,7 @@ services:

# services for integration testing
frontend-integration-test:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:latest
extends:
file: common-services.yml
service: test_builder
Expand All @@ -181,7 +181,7 @@ services:
aliases:
- frontend
linux-integration-test:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-linux-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-linux-env:latest
extends:
file: common-services.yml
service: test_remote_builder
Expand All @@ -193,7 +193,7 @@ services:
aliases:
- linux
android_ndk25-integration-test:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-android-ndk25-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-android-ndk25-env:latest
extends:
file: common-services.yml
service: test_builder
Expand All @@ -206,7 +206,7 @@ services:
aliases:
- android-ndk25
emscripten_2011-integration-test:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-emsdk-2011-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-emsdk-2011-env:latest
extends:
file: common-services.yml
service: test_remote_builder
Expand All @@ -217,7 +217,7 @@ services:
aliases:
- emsdk-2011
emscripten_3155-integration-test:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-emsdk-3155-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-emsdk-3155-env:latest
extends:
file: common-services.yml
service: test_remote_builder
Expand All @@ -228,7 +228,7 @@ services:
aliases:
- emsdk-3155
win_2019-integration-test:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-winsdk-2019-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2019-env:latest
extends:
file: common-services.yml
service: test_remote_builder
Expand All @@ -239,7 +239,7 @@ services:
aliases:
- winsdk-2019
win_2022-integration-test:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-winsdk-2022-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022-env:latest
extends:
file: common-services.yml
service: test_remote_builder
Expand All @@ -252,7 +252,7 @@ services:

# linux service for auth testing
frontend-auth-test:
image: europe-north1-docker.pkg.dev/extender-poc/extender-public-registry/extender-base-env:latest
image: europe-north1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:latest
extends:
file: common-services.yml
service: test_builder
Expand Down

0 comments on commit 82fb40c

Please sign in to comment.