Merge pull request #4408 from mendersoftware/master

Align Staging with Master

.gitlab-ci.yml

@@ -6,6 +6,7 @@ stages:
   - build
   - e2e-test
   - publish
+  - version-bump
 
 variables:
   DOCKER_REPOSITORY: mendersoftware/gui
@@ -486,3 +487,41 @@ coveralls:done:
     - curl "https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN" -d "payload[build_num]=$CI_PIPELINE_ID&payload[status]=done"
   tags:
     - mender-qa-worker-generic-light
+
+#
+# Mender Helm Rolling release
+#
+.trigger:mender-helm-version-bump:
+  stage: version-bump
+  allow_failure: true
+  trigger:
+    project: Northern.tech/Mender/mender-helm
+    strategy: depend
+  resource_group: mender-helm
+  variables:
+    SYNC_CONTAINER_NAME: $CONTAINER_NAME
+    SYNC_IMAGE_TAG: $DOCKER_PUBLISH_COMMIT_TAG
+    CONTAINER: gui
+    DOCKER_PUBLISH_COMMIT_TAG: ${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHA}
+    GITHUB_HELM_REPO: "github.com/mendersoftware/mender-helm.git"
+    CHART_DIR: "mender"
+
+trigger:mender-helm-version-bump:staging:
+  extends:
+    - .trigger:mender-helm-version-bump
+  rules:
+    - if: $CI_COMMIT_BRANCH =~ /^(staging)$/
+  variables:
+    SYNC_ENVIRONMENT: staging
+    HELM_PATCH_VERSION: ${CI_PIPELINE_ID}-staging # pre-release version for trigger staging only deploy
+
+trigger:mender-helm-version-bump:prod:
+  extends:
+    - .trigger:mender-helm-version-bump
+  rules:
+    - if: '$CI_COMMIT_TAG =~ /^saas-[a-zA-Z0-9.]+$/'
+      when: manual
+  variables:
+    SYNC_ENVIRONMENT: prod
+    HELM_PATCH_VERSION: ${CI_PIPELINE_ID}
+    DOCKER_PUBLISH_COMMIT_TAG: ${CI_COMMIT_REF_NAME}

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM node:21.7.1-alpine AS base
+FROM --platform=$BUILDPLATFORM node:22.0.0-alpine AS base
 WORKDIR /usr/src/app
 COPY package-lock.json package.json ./
 RUN npm ci
@@ -11,7 +11,7 @@ COPY . ./
 RUN npm run build
 
 
-FROM nginxinc/nginx-unprivileged:1.25.4-alpine AS unprivileged
+FROM nginxinc/nginx-unprivileged:1.25.5-alpine AS unprivileged
 EXPOSE 8090
 WORKDIR /var/www/mender-gui/dist
 ARG GIT_COMMIT_TAG
@@ -25,7 +25,7 @@ HEALTHCHECK --interval=8s --timeout=15s --start-period=120s --retries=128 CMD wg
 CMD ["nginx"]
 
 
-FROM nginx:1.25.4-alpine AS production
+FROM nginx:1.26.0-alpine AS production
 EXPOSE 8080
 WORKDIR /var/www/mender-gui/dist
 ARG GIT_COMMIT_TAG