Merge branch 'master' into dependabot/terraform/infrastructure/terraform_aws_backup/aws-backup-source/kreuzwerker/docker-4.2.0

Thomas-Boyle · web-flow · commit 2785276281cd · 2026-04-17T15:31:23.000+01:00
diff --git a/.github/workflows/dependabot-auto-approve.yml b/.github/workflows/dependabot-auto-approve.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Fetch Dependabot metadata
         id: metadata
         continue-on-error: true
-        uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a
+        uses: dependabot/fetch-metadata@ffa630c65fa7e0ecfa0625b5ceda64399aea1b36
 
       - name: Auto-approve minor and patch updates
         if: steps.metadata.outcome == 'success' && contains(fromJSON('["version-update:semver-minor", "version-update:semver-patch"]'), steps.metadata.outputs.update-type)
diff --git a/infrastructure/account/recordprocessor_ecr_repo.tf b/infrastructure/account/recordprocessor_ecr_repo.tf
@@ -4,27 +4,4 @@ resource "aws_ecr_repository" "recordprocessor_repository" {
   }
   image_tag_mutability = "IMMUTABLE"
   name                 = "imms-recordprocessor-repo"
-}
-
-resource "aws_ecr_lifecycle_policy" "recordprocessor_repository_lifecycle_policy" {
-  repository = aws_ecr_repository.recordprocessor_repository.name
-
-  policy = <<EOF
-{
-  "rules": [
-    {
-      "rulePriority": 1,
-      "description": "Keep last 10 images.",
-      "selection": {
-        "tagStatus": "any",
-        "countType": "imageCountMoreThan",
-        "countNumber": 10
-      },
-      "action": {
-        "type": "expire"
-      }
-    }
-  ]
-}
-EOF
 }
diff --git a/infrastructure/instance/.terraform.lock.hcl b/infrastructure/instance/.terraform.lock.hcl
diff --git a/infrastructure/instance/main.tf b/infrastructure/instance/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     docker = {
       source  = "kreuzwerker/docker"
-      version = "3.9.0"
+      version = "4.2.0"
     }
   }
   backend "s3" {
diff --git a/infrastructure/terraform_aws_backup/aws-backup-destination/main.tf b/infrastructure/terraform_aws_backup/aws-backup-destination/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     docker = {
       source  = "kreuzwerker/docker"
-      version = "3.9.0"
+      version = "4.2.0"
     }
   }
   backend "s3" {
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ terraform {`
`6`	`6`	`}`
`7`	`7`	`docker = {`
`8`	`8`	`source = "kreuzwerker/docker"`
`9`		`- version = "3.9.0"`
	`9`	`+ version = "4.2.0"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`backend "s3" {`