Get garage environment working again - main

docker/object-storage/docker-compose.yml

@@ -21,13 +21,13 @@ services:
   #      - ./storage/pict-rs:/mnt
   #      - ../../:/opt/app
 
-  pictrs_proxy:
+  # pictrs_proxy:
-    image: asonix/pictrs-proxy:0.4.0-rc.2
+  #   image: asonix/pictrs-proxy:0.4.0-rc.2
-    ports:
+  #   ports:
-      - "8081:8081"
+  #     - "8081:8081"
-    environment:
+  #   environment:
-      - PICTRS_PROXY_UPSTREAM=http://pictrs:8080
+  #     - PICTRS_PROXY_UPSTREAM=http://pictrs:8080
-      - PICTRS_PROXY_OPENTELEMETRY_URL=http://otel:4137
+  #     - PICTRS_PROXY_OPENTELEMETRY_URL=http://otel:4137
 
   minio:
     image: quay.io/minio/minio

docker/object-storage/setup-garage.sh

@@ -19,6 +19,7 @@ key_id=$(garage -c garage-local.toml key info pict-rs-key 2>>"${STDERR}" | grep
 secret_key=$(garage -c garage-local.toml key info pict-rs-key 2>>"${STDERR}" | grep "Secret key" | awk '{ print $3 }')
 
 garage -c garage-local.toml bucket allow --read --write --owner pict-rs --key pict-rs-key >>"${STDOUT}" 2>>"${STDERR}"
+garage -c garage-local.toml bucket website pict-rs --allow >> "${STDOUT}" 2>>"${STDERR}"
 
 cat > pict-rs-garage.toml <<EOF
 [server]

flake.nix

@@ -34,6 +34,7 @@
             clippy
             exiftool
             ffmpeg_6-full
+            garage
             gcc
             imagemagick
             protobuf