Merge branch 'main' into CI-2493-latest-atlantis-changes

Dockerfile

@@ -7,7 +7,7 @@ ARG DEFAULT_CONFTEST_VERSION=0.44.1
 
 # Stage 1: build artifact and download deps
 
-FROM golang:1.21.6-alpine AS builder
+FROM golang:1.22.0-alpine AS builder
 
 ARG ATLANTIS_VERSION=dev
 ENV ATLANTIS_VERSION=${ATLANTIS_VERSION}

docker-compose.yml

@@ -27,7 +27,7 @@ services:
         - redis
         build:
             context: .
-            dockerfile: Dockerfile.dev
+            dockerfile: _Dockerfile.dev
         ports:
         - 4141:4141
         volumes:

server/core/db/boltdb.go

@@ -163,7 +163,7 @@ func (b *BoltDB) List() ([]models.ProjectLock, error) {
 	for k, v := range locksBytes {
 		var lock models.ProjectLock
 		if err := json.Unmarshal(v, &lock); err != nil {
-			return locks, errors.Wrap(err, fmt.Sprintf("failed to deserialize lock at key '%d'", k))
+			return locks, errors.Wrap(err, fmt.Sprintf("failed to deserialize lock at key %q", fmt.Sprint(k)))
 		}
 		locks = append(locks, lock)
 	}