Merge pull request #2668 from wellcomecollection/bump-scala-libs-to-v…

…32.41.1 Bump scala-libs to v32.41.1
wellcomecollection · Jul 23, 2024 · b9906b1 · b9906b1
2 parents bc70c8e + b73fbd7
commit b9906b1
Show file tree

Hide file tree

Showing 29 changed files with 57 additions and 29 deletions.
diff --git a/calm_adapter/calm_adapter/docker-compose.yml b/calm_adapter/calm_adapter/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/calm_adapter/calm_deletion_checker/docker-compose.yml b/calm_adapter/calm_deletion_checker/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
 

diff --git a/calm_adapter/calm_indexer/docker-compose.yml b/calm_adapter/calm_indexer/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   elasticsearch:

diff --git a/common/pipeline_storage/docker-compose.yml b/common/pipeline_storage/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   elasticsearch:

diff --git a/mets_adapter/mets_adapter/docker-compose.yml b/mets_adapter/mets_adapter/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   dynamodb:

diff --git a/pipeline/id_minter/docker-compose.yml b/pipeline/id_minter/docker-compose.yml
@@ -7,8 +7,9 @@ services:
     environment:
         - "MYSQL_ROOT_PASSWORD=password"
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/pipeline/inferrer/inference_manager/docker-compose.yml b/pipeline/inferrer/inference_manager/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
 

diff --git a/pipeline/ingestor/ingestor_images/docker-compose.yml b/pipeline/ingestor/ingestor_images/docker-compose.yml
@@ -2,9 +2,10 @@ version: "3.3"
 
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   elasticsearch:

diff --git a/pipeline/ingestor/ingestor_works/docker-compose.yml b/pipeline/ingestor/ingestor_works/docker-compose.yml
@@ -2,9 +2,10 @@ version: "3.3"
 
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   elasticsearch:

diff --git a/pipeline/matcher_merger/matcher/docker-compose.yml b/pipeline/matcher_merger/matcher/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   dynamodb:

diff --git a/pipeline/matcher_merger/merger/docker-compose.yml b/pipeline/matcher_merger/merger/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '2'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   dynamodb:

diff --git a/pipeline/relation_embedder/batcher/docker-compose.yml b/pipeline/relation_embedder/batcher/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/pipeline/relation_embedder/path_concatenator/docker-compose.yml b/pipeline/relation_embedder/path_concatenator/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   elasticsearch:

diff --git a/pipeline/relation_embedder/relation_embedder/docker-compose.yml b/pipeline/relation_embedder/relation_embedder/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   elasticsearch:

diff --git a/pipeline/relation_embedder/router/docker-compose.yml b/pipeline/relation_embedder/router/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/pipeline/transformer/transformer_calm/docker-compose.yml b/pipeline/transformer/transformer_calm/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/pipeline/transformer/transformer_common/docker-compose.yml b/pipeline/transformer/transformer_common/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/pipeline/transformer/transformer_ebsco/docker-compose.yml b/pipeline/transformer/transformer_ebsco/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '2'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/pipeline/transformer/transformer_mets/docker-compose.yml b/pipeline/transformer/transformer_mets/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/pipeline/transformer/transformer_miro/docker-compose.yml b/pipeline/transformer/transformer_miro/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/pipeline/transformer/transformer_sierra/docker-compose.yml b/pipeline/transformer/transformer_sierra/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   elasticsearch:

diff --git a/pipeline/transformer/transformer_tei/docker-compose.yml b/pipeline/transformer/transformer_tei/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '2'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,7 +2,7 @@ import sbt._
 import scala.language.reflectiveCalls
 object WellcomeDependencies {
 
-  val defaultVersion = "32.40.4" // This is automatically bumped by the scala-libs release process, do not edit this line manually
+  val defaultVersion = "32.41.1" // This is automatically bumped by the scala-libs release process, do not edit this line manually
     "32.40.4" // This is automatically bumped by the scala-libs release process, do not edit this line manually
 
   lazy val versions = new {

diff --git a/reindexer/reindex_worker/docker-compose.yml b/reindexer/reindex_worker/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   dynamodb:

diff --git a/sierra_adapter/sierra_indexer/docker-compose.yml b/sierra_adapter/sierra_indexer/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   elasticsearch:

diff --git a/sierra_adapter/sierra_linker/docker-compose.yml b/sierra_adapter/sierra_linker/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/sierra_adapter/sierra_merger/docker-compose.yml b/sierra_adapter/sierra_merger/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/tei_adapter/tei_adapter/docker-compose.yml b/tei_adapter/tei_adapter/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
diff --git a/tei_adapter/tei_id_extractor/docker-compose.yml b/tei_adapter/tei_id_extractor/docker-compose.yml
@@ -1,9 +1,10 @@
 version: '3.3'
 services:
   localstack:
-    image: "760097843905.dkr.ecr.eu-west-1.amazonaws.com/localstack/localstack:0.12.5"
+    image: "public.ecr.aws/localstack/localstack:3.5.0"
     environment:
       - SERVICES=sqs
+      - ALLOW_NONSTANDARD_REGIONS=1
     ports:
       - "4566:4566"
   mysql: