Merge pull request #344 from mendersoftware/master

Align staging with master
mendersoftware · Dec 19, 2023 · 569a239 · 569a239
2 parents 79c4d46 + 900466d
commit 569a239
Show file tree

Hide file tree

Showing 11 changed files with 325 additions and 217 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,10 +7,14 @@ updates:
     schedule:
       interval: monthly
       day: saturday
+    reviewers:
+      - "mendersoftware/backend-dependabot-reviewers"
   - commit-message:
       prefix: chore
     directory: /
     package-ecosystem: docker
     schedule:
       interval: monthly
       day: saturday
+    reviewers:
+      - "mendersoftware/backend-dependabot-reviewers"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -121,9 +121,9 @@ publish:acceptance:
 #
 .trigger:alvaldi-helm-version-bump:
   stage: alvaldi-version-bump
+  allow_failure: true
   trigger:
     project: Northern.tech/NorthernTechHQ/alvaldi-helm
-    strategy: depend
   variables:
     SYNC_CONTAINER_NAME: $CONTAINER_NAME
     SYNC_IMAGE_TAG: $DOCKER_PUBLISH_COMMIT_TAG
@@ -136,7 +136,7 @@ trigger:alvaldi-helm-version-bump:staging:
   extends:
     - .trigger:alvaldi-helm-version-bump
   rules:
-    - if: $CI_COMMIT_BRANCH =~ /^(master|staging)$/
+    - if: $CI_COMMIT_BRANCH =~ /^(staging)$/
   variables:
     SYNC_ENVIRONMENT: staging
     HELM_PATCH_VERSION: ${CI_PIPELINE_ID}-staging # pre-release version for trigger staging only deploy

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20.4-alpine3.16 as builder
+FROM --platform=$BUILDPLATFORM golang:1.21.5-alpine3.19 as builder
 ARG TARGETARCH
 WORKDIR /go/src/github.com/mendersoftware/deviceconnect
 RUN mkdir -p /etc_extra

diff --git a/Dockerfile.acceptance b/Dockerfile.acceptance
@@ -1,4 +1,4 @@
-FROM golang:1.20.4-alpine3.16 as builder
+FROM golang:1.21.5-alpine3.19 as builder
 WORKDIR /go/src/github.com/mendersoftware/deviceconnect
 RUN mkdir -p /etc_extra
 RUN echo "nobody:x:65534:" > /etc_extra/group