Merge branch 'main' into terms-and-friends

JacobCoffee · web-flow · commit 93cd1c25a667 · 2026-04-11T18:06:50.000-05:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -57,7 +57,7 @@ services:
     links:
       - db
   registry:
-    image: registry:2
+    image: registry:3
     restart: always
     command: ["/etc/docker/registry-local/config.yml"]
     environment:
@@ -66,9 +66,10 @@ services:
       REGISTRY_STORAGE_S3_REGION: us-east-1
       REGISTRY_STORAGE_S3_REGIONENDPOINT: http://minio:9000
       REGISTRY_STORAGE_S3_BUCKET: cabotage-registry
-      REGISTRY_STORAGE_S3_SECURE: "true"
+      REGISTRY_STORAGE_S3_SECURE: "false"
       REGISTRY_STORAGE_S3_V4AUTH: "true"
       REGISTRY_STORAGE_S3_CHUNKSIZE: 5242880
+      REGISTRY_STORAGE_S3_FORCEPATHSTYLE: "true"
       REGISTRY_STORAGE_DELETE_ENABLED: true
     ports:
       - "5001:5001"
diff --git a/docker-compose/registry/config.yml b/docker-compose/registry/config.yml
@@ -5,6 +5,7 @@ auth:
     service: cabotage-registry
     issuer: cabotage-app
     rootcertbundle: /etc/docker/registry-local/public_key_bundle
+    jwks: /etc/docker/registry-local/jwks.json
 log:
   level: debug
   fields:
diff --git a/docker-compose/registry/jwks.json b/docker-compose/registry/jwks.json
@@ -0,0 +1 @@
+{"keys": [{"kty": "EC", "crv": "P-256", "kid": "7MRI:NNF2:JBEA:W5LR:BAY5:7AJN:RU3N:EGS3:VHC5:6V6F:7HHJ:GNH5", "alg": "ES256", "use": "sig", "x": "pRojoocv4-mZd7qSZOo7AEiVXg8Q3EKN2Xp8JOFaWf4", "y": "tRTWcaawL_sI0m17yoBd4_-vis0TFkdmFujYBOblpMY"}]}
diff --git a/docker-compose/registry/public_key_bundle b/docker-compose/registry/public_key_bundle
@@ -1,9 +1,9 @@
 -----BEGIN CERTIFICATE-----
-MIIBLjCB1KADAgECAhQr/gBut0a0WdjfEnbVwuUvN6bMazAKBggqhkjOPQQDAjAX
-MRUwEwYDVQQDDAxjYWJvdGFnZS1hcHAwHhcNMTgwMTI4MjAyODE1WhcNMTkwMTI5
-MjAyODE1WjAXMRUwEwYDVQQDDAxjYWJvdGFnZS1hcHAwWTATBgcqhkjOPQIBBggq
+MIIBLjCB1KADAgECAhQDWwwnG/OyDuzhkUx1cl0MTbOAdTAKBggqhkjOPQQDAjAX
+MRUwEwYDVQQDDAxjYWJvdGFnZS1hcHAwHhcNMjYwMjI2MTI1MTQwWhcNMjcwMjI3
+MTI1MTQwWjAXMRUwEwYDVQQDDAxjYWJvdGFnZS1hcHAwWTATBgcqhkjOPQIBBggq
 hkjOPQMBBwNCAASlGiOihy/j6Zl3upJk6jsASJVeDxDcQo3Zenwk4VpZ/rUU1nGm
-sC/7CNJte8qAXeP/r4rNExZHZhbo2ATm5aTGMAoGCCqGSM49BAMCA0kAMEYCIQCb
-LPIWZhlsF7q5f0eebu5C9O2qMZg8Y0wME7TpLgMSFAIhAKFZ+ZDPdTCx3HkMzPv5
-OWV+/WcvNCjTpchQoNR4mJUW
+sC/7CNJte8qAXeP/r4rNExZHZhbo2ATm5aTGMAoGCCqGSM49BAMCA0kAMEYCIQDj
+b/UmYQbmLFdw7nxBvU2OsKRTP2gFDoU/ScuwBrKulAIhAMWzBEqx1dDyPSn/Wfo2
+8fgnPHyaXzi5eaAgsScIfGLs
 -----END CERTIFICATE-----

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"keys": [{"kty": "EC", "crv": "P-256", "kid": "7MRI:NNF2:JBEA:W5LR:BAY5:7AJN:RU3N:EGS3:VHC5:6V6F:7HHJ:GNH5", "alg": "ES256", "use": "sig", "x": "pRojoocv4-mZd7qSZOo7AEiVXg8Q3EKN2Xp8JOFaWf4", "y": "tRTWcaawL_sI0m17yoBd4_-vis0TFkdmFujYBOblpMY"}]}`