Merge branch 'main' into v2

tests/setup/docker-compose-postgres.yml

@@ -20,8 +20,10 @@ services:
       file: docker-compose.yml
       service: pocket-id
     environment:
+      - APP_ENV=test
       - DB_PROVIDER=postgres
       - DB_CONNECTION_STRING=postgres://postgres:postgres@postgres:5432/pocket-id
+      - FILE_BACKEND=${FILE_BACKEND}
     depends_on:
       postgres:
         condition: service_healthy

tests/setup/docker-compose-s3.yml

@@ -13,7 +13,7 @@ services:
       retries: 10
 
   create-bucket:
-    image: amazon/aws-cli
+    image: amazon/aws-cli:latest
     environment:
       AWS_ACCESS_KEY_ID: test
       AWS_SECRET_ACCESS_KEY: test

tests/setup/docker-compose.yml

@@ -15,6 +15,7 @@ services:
     environment:
       APP_ENV: test
       ENCRYPTION_KEY: test-encryption-key
+      FILE_BACKEND: ${FILE_BACKEND}
     build:
       args:
         - BUILD_TAGS=e2etest