Staging update 20240307 (#6747)

OpenSlides · Mar 7, 2024 · 63b6b4b · 63b6b4b
1 parent 48671f6
commit 63b6b4b
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -3,7 +3,7 @@ name: Build Docker images for all OpenSlides services
 on:
   push:
     branches:
-      - main
+      - staging/4*
       - stable/4*
   workflow_dispatch:
 

diff --git a/dev/docker/build.sh b/dev/docker/build.sh
@@ -18,12 +18,15 @@ TARGETS=(
   [vote]="$HOME/openslides-vote-service/"
   [icc]="$HOME/openslides-icc-service/"
 )
-CLIENT_VERSION_TXT="${TARGETS[client]}/client/src/assets/version.txt"
 
 DOCKER_REPOSITORY="openslides"
 DOCKER_TAG="$(cat VERSION)"
-[[ "$(git rev-parse --abbrev-ref HEAD)" != main ]] ||
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+if [[ "$BRANCH" == staging/* ]]; then
   DOCKER_TAG="$DOCKER_TAG-staging-$(date +%Y%m%d)-$(git rev-parse HEAD | cut -c -7)"
+elif [[ "$BRANCH" != stable/* ]]; then
+  DOCKER_TAG="$DOCKER_TAG-$BRANCH"
+fi
 CONFIG="/etc/osinstancectl"
 OPTIONS=()
 BUILT_IMAGES=()

diff --git a/openslides-auth-service b/openslides-auth-service
diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service
diff --git a/openslides-backend b/openslides-backend
diff --git a/openslides-client b/openslides-client
diff --git a/openslides-datastore-service b/openslides-datastore-service
diff --git a/openslides-icc-service b/openslides-icc-service
diff --git a/openslides-manage-service b/openslides-manage-service
diff --git a/openslides-media-service b/openslides-media-service
diff --git a/openslides-proxy b/openslides-proxy
diff --git a/openslides-search-service b/openslides-search-service
diff --git a/openslides-vote-service b/openslides-vote-service