Merge branch '2024.11'

tine-groupware · Dec 11, 2024 · 2e8c88a · 2e8c88a
2 parents 8bf6d79 + 3b02c9e
commit 2e8c88a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/ci/gitlab-ci/lib.yml b/ci/gitlab-ci/lib.yml
@@ -117,7 +117,7 @@
               --build-arg CUSTOM_APP_NAME \
               --build-arg CUSTOM_APP_GIT_URL \
               --build-arg CUSTOM_APP_VERSION \
-              --build-arg RELEASE=$(packaging_version) \
+              --build-arg RELEASE=$(release_get_package_version) \
               --build-arg CODENAME \
               --build-arg REVISION=0 \
               .
@@ -142,7 +142,7 @@
               --build-arg CUSTOM_APP_NAME \
               --build-arg CUSTOM_APP_GIT_URL \
               --build-arg CUSTOM_APP_VERSION \
-              --build-arg RELEASE=$(packaging_version) \
+              --build-arg RELEASE=$(release_get_package_version) \
               --build-arg CODENAME \
               --build-arg REVISION=0 \
               .
@@ -161,7 +161,7 @@
               --file ./ci/dockerimage/Dockerfile \
               --build-arg BUILT_IMAGE \
               --build-arg ZIP_PACKAGES \
-              --build-arg RELEASE=$(packaging_version) \
+              --build-arg RELEASE=$(release_get_package_version) \
               --build-arg CODENAME \
               --build-arg REVISION=0 \
               -o type=tar,dest=${outputPath} \
@@ -1146,7 +1146,7 @@
                 --build-arg CUSTOM_APP_NAME \
                 --build-arg CUSTOM_APP_GIT_URL \
                 --build-arg CUSTOM_APP_VERSION \
-                --build-arg RELEASE=$(packaging_version) \
+                --build-arg RELEASE=$(release_get_package_version) \
                 --build-arg CODENAME \
                 --build-arg REVISION=0 \
                 .
@@ -1171,7 +1171,7 @@
                 --build-arg CUSTOM_APP_NAME \
                 --build-arg CUSTOM_APP_GIT_URL \
                 --build-arg CUSTOM_APP_VERSION \
-                --build-arg RELEASE=$(packaging_version) \
+                --build-arg RELEASE=$(release_get_package_version) \
                 --build-arg CODENAME \
                 --build-arg REVISION=0 \
                 .
@@ -1190,7 +1190,7 @@
                 --file ./ci/dockerimage/Dockerfile \
                 --build-arg BUILT_IMAGE \
                 --build-arg ZIP_PACKAGES \
-                --build-arg RELEASE=$(packaging_version) \
+                --build-arg RELEASE=$(release_get_package_version) \
                 --build-arg CODENAME \
                 --build-arg REVISION=0 \
                 -o type=tar,dest=${outputPath} \
@@ -2221,7 +2221,7 @@
                 --build-arg CUSTOM_APP_NAME \
                 --build-arg CUSTOM_APP_GIT_URL \
                 --build-arg CUSTOM_APP_VERSION \
-                --build-arg RELEASE=$(packaging_version) \
+                --build-arg RELEASE=$(release_get_package_version) \
                 --build-arg CODENAME \
                 --build-arg REVISION=0 \
                 .
@@ -2246,7 +2246,7 @@
                 --build-arg CUSTOM_APP_NAME \
                 --build-arg CUSTOM_APP_GIT_URL \
                 --build-arg CUSTOM_APP_VERSION \
-                --build-arg RELEASE=$(packaging_version) \
+                --build-arg RELEASE=$(release_get_package_version) \
                 --build-arg CODENAME \
                 --build-arg REVISION=0 \
                 .
@@ -2265,7 +2265,7 @@
                 --file ./ci/dockerimage/Dockerfile \
                 --build-arg BUILT_IMAGE \
                 --build-arg ZIP_PACKAGES \
-                --build-arg RELEASE=$(packaging_version) \
+                --build-arg RELEASE=$(release_get_package_version) \
                 --build-arg CODENAME \
                 --build-arg REVISION=0 \
                 -o type=tar,dest=${outputPath} \

diff --git a/ci/gitlab-ci/lib/scripts/docker_build_image.sh b/ci/gitlab-ci/lib/scripts/docker_build_image.sh
@@ -45,7 +45,7 @@ docker_build_image_built() {
         --build-arg CUSTOM_APP_NAME \
         --build-arg CUSTOM_APP_GIT_URL \
         --build-arg CUSTOM_APP_VERSION \
-        --build-arg RELEASE=$(packaging_version) \
+        --build-arg RELEASE=$(release_get_package_version) \
         --build-arg CODENAME \
         --build-arg REVISION=0 \
         .
@@ -70,7 +70,7 @@ docker_build_image_built_test() {
         --build-arg CUSTOM_APP_NAME \
         --build-arg CUSTOM_APP_GIT_URL \
         --build-arg CUSTOM_APP_VERSION \
-        --build-arg RELEASE=$(packaging_version) \
+        --build-arg RELEASE=$(release_get_package_version) \
         --build-arg CODENAME \
         --build-arg REVISION=0 \
         .
@@ -89,7 +89,7 @@ docker_build_image_packages() {
         --file ./ci/dockerimage/Dockerfile \
         --build-arg BUILT_IMAGE \
         --build-arg ZIP_PACKAGES \
-        --build-arg RELEASE=$(packaging_version) \
+        --build-arg RELEASE=$(release_get_package_version) \
         --build-arg CODENAME \
         --build-arg REVISION=0 \
         -o type=tar,dest=${outputPath} \