Merge branch 'main' into cras

.circleci/config.yml

@@ -6,7 +6,7 @@ orbs:
 parameters:
   go-version:
     type: string
-    default: '1.22.8'
+    default: '1.23.2'
 
 executors:
   node:

.github/dependabot.yml

@@ -8,11 +8,58 @@ updates:
   - package-ecosystem: "gomod" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "friday"
+      time: "07:00"
     target-branch: main
+    groups:
+      moby:
+        applies-to: "version-updates"
+        patterns:
+          - "github.com/moby/*"
+          - "github.com/docker/*"
+      containerd:
+        applies-to: "version-updates"
+        patterns:
+          - "github.com/containerd/*"
+      opencontainers:
+        applies-to: "version-updates"
+        patterns:
+          - "github.com/opencontainers/*"
+      minor:
+        applies-to: "version-updates"
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
+
   - package-ecosystem: "gomod" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "friday"
+      time: "08:00"
     target-branch: release-4.2
+    groups:
+      moby:
+        applies-to: "version-updates"
+        patterns:
+          - "github.com/moby/*"
+          - "github.com/docker/*"
+      containerd:
+        applies-to: "version-updates"
+        patterns:
+          - "github.com/containerd/*"
+      opencontainers:
+        applies-to: "version-updates"
+        patterns:
+          - "github.com/opencontainers/*"
+      minor:
+        applies-to: "version-updates"
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
 

CHANGELOG.md

@@ -1,5 +1,12 @@
 # SingularityCE Changelog
 
+## Changes Since Last Release
+
+### Bug Fixes
+
+- Fix regression from 4.1.5 that overwrites source image runscript, environment
+  etc. in build from local image.
+
 ## 4.2.1 \[2024-09-13\]
 
 ### Bug Fixes

INSTALL.md

@@ -143,7 +143,7 @@ _**NOTE:** if you are updating Go from a older version, make sure you remove
 `/usr/local/go` before reinstalling it._
 
 ```sh
-export VERSION=1.22.8 OS=linux ARCH=amd64  # change this as you need
+export VERSION=1.23.2 OS=linux ARCH=amd64  # change this as you need
 
 wget -O /tmp/go${VERSION}.${OS}-${ARCH}.tar.gz \
   https://dl.google.com/go/go${VERSION}.${OS}-${ARCH}.tar.gz