From 3b05301cd487580dc93be6f0f07b6d6ec520d9bc Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 1 Sep 2026 13:39:17 -0700 Subject: [PATCH 1/6] SYS-701 work-around for docker-in-docker pipeline regression --- .gitlab-ci.yml | 2 +- .image-gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2b8dbfb..4617c8ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ workflow: - { if: $CI_COMMIT_TAG =~ /^chart-.*/, when: never } - when: always -image: docker:29.7.2 +image: docker:29.6.2 prepare: stage: prepare diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 0c2e2939..89a2b08c 100644 --- a/.image-gitlab-ci.yml +++ b/.image-gitlab-ci.yml @@ -13,7 +13,7 @@ stages: - Security Scan - Promote Image -image: docker:29.7.2 +image: docker:29.6.2 .registry_template: ®istry_login before_script: From 3179c4cc157ebf761383187ff2e5437602b59e53 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 1 Sep 2026 13:47:22 -0700 Subject: [PATCH 2/6] SYS-701 wip --- .gitlab-ci.yml | 2 +- .image-gitlab-ci.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4617c8ec..e2b8dbfb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ workflow: - { if: $CI_COMMIT_TAG =~ /^chart-.*/, when: never } - when: always -image: docker:29.6.2 +image: docker:29.7.2 prepare: stage: prepare diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 89a2b08c..43e27930 100644 --- a/.image-gitlab-ci.yml +++ b/.image-gitlab-ci.yml @@ -13,13 +13,13 @@ stages: - Security Scan - Promote Image -image: docker:29.6.2 +image: docker:29.7.2 .registry_template: ®istry_login before_script: - export TAG=bld_$CI_PIPELINE_IID_${CI_COMMIT_SHORT_SHA} - docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $REGISTRY - services: [ "docker:dind" ] + services: [ "docker:29.7.2-dind" ] analysis: stage: Static Code Analysis @@ -30,14 +30,14 @@ create_image: <<: *registry_login stage: Create Image script: apk add make && cd images/$IMAGE && make create_image - services: [ { name: "docker:dind", command: ["--experimental"] } ] + services: [ { name: "docker:29.7.2-dind", command: ["--experimental"] } ] test: stage: Functional Tests script: apk add make && cd images/$IMAGE && make test_functional security_scan_trivy: - services: [ "docker:dind" ] + services: [ "docker:29.7.2-dind" ] image: name: aquasec/trivy:$TRIVY_VERSION entrypoint: [""] From 074944bac65317db093e533f4afcfe86f8651ce1 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 1 Sep 2026 13:54:57 -0700 Subject: [PATCH 3/6] SYS-701 wip --- .image-gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 43e27930..8f625bca 100644 --- a/.image-gitlab-ci.yml +++ b/.image-gitlab-ci.yml @@ -19,7 +19,7 @@ image: docker:29.7.2 before_script: - export TAG=bld_$CI_PIPELINE_IID_${CI_COMMIT_SHORT_SHA} - docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $REGISTRY - services: [ "docker:29.7.2-dind" ] + services: [ "docker:29.6.2-dind" ] analysis: stage: Static Code Analysis @@ -30,14 +30,14 @@ create_image: <<: *registry_login stage: Create Image script: apk add make && cd images/$IMAGE && make create_image - services: [ { name: "docker:29.7.2-dind", command: ["--experimental"] } ] + services: [ { name: "docker:29.6.2-dind", command: ["--experimental"] } ] test: stage: Functional Tests script: apk add make && cd images/$IMAGE && make test_functional security_scan_trivy: - services: [ "docker:29.7.2-dind" ] + services: [ "docker:29.6.2-dind" ] image: name: aquasec/trivy:$TRIVY_VERSION entrypoint: [""] From 6340d78ca5414d69b1adb23eb76ee078401044a7 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 1 Sep 2026 21:59:19 -0700 Subject: [PATCH 4/6] SYS-701 wip --- .image-gitlab-ci.yml | 6 +++--- lib/build/Makefile.docker_image | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 8f625bca..0c2e2939 100644 --- a/.image-gitlab-ci.yml +++ b/.image-gitlab-ci.yml @@ -19,7 +19,7 @@ image: docker:29.7.2 before_script: - export TAG=bld_$CI_PIPELINE_IID_${CI_COMMIT_SHORT_SHA} - docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $REGISTRY - services: [ "docker:29.6.2-dind" ] + services: [ "docker:dind" ] analysis: stage: Static Code Analysis @@ -30,14 +30,14 @@ create_image: <<: *registry_login stage: Create Image script: apk add make && cd images/$IMAGE && make create_image - services: [ { name: "docker:29.6.2-dind", command: ["--experimental"] } ] + services: [ { name: "docker:dind", command: ["--experimental"] } ] test: stage: Functional Tests script: apk add make && cd images/$IMAGE && make test_functional security_scan_trivy: - services: [ "docker:29.6.2-dind" ] + services: [ "docker:dind" ] image: name: aquasec/trivy:$TRIVY_VERSION entrypoint: [""] diff --git a/lib/build/Makefile.docker_image b/lib/build/Makefile.docker_image index 9fb3c17f..9e4914e4 100644 --- a/lib/build/Makefile.docker_image +++ b/lib/build/Makefile.docker_image @@ -1,7 +1,7 @@ # Standard Makefile for Docker image # created by richb@instantlinux.net 20-Apr-2017 -BUILDX = https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64 +BUILDX = https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.30.1.linux-amd64 PLATFORMS ?= linux/amd64 PUSH ?= --push USER_LOGIN ?= instantlinux From e5ae00b772a8e351191b2f219f27aec6fb4177d8 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 1 Sep 2026 22:02:39 -0700 Subject: [PATCH 5/6] SYS-701 wip --- lib/build/Makefile.docker_image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build/Makefile.docker_image b/lib/build/Makefile.docker_image index 9e4914e4..a4f3870e 100644 --- a/lib/build/Makefile.docker_image +++ b/lib/build/Makefile.docker_image @@ -1,7 +1,7 @@ # Standard Makefile for Docker image # created by richb@instantlinux.net 20-Apr-2017 -BUILDX = https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.30.1.linux-amd64 +BUILDX = https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-amd64 PLATFORMS ?= linux/amd64 PUSH ?= --push USER_LOGIN ?= instantlinux From b4908b8ba65c3a3933d9f2516e7b800bdd43a1f1 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 1 Sep 2026 22:07:22 -0700 Subject: [PATCH 6/6] SYS-701 wip --- .image-gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 0c2e2939..07716aee 100644 --- a/.image-gitlab-ci.yml +++ b/.image-gitlab-ci.yml @@ -79,7 +79,7 @@ security_scan_trivy: artifacts: reports: container_scanning: gl-container-scanning-report.json - expire_in: 30 days + expire_in: 90 days paths: [ medium-vulns.txt ] promote_image: