From d16e81be20bbf15f1c967168d5bf23fe996b21e5 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Fri, 7 Jul 2023 12:30:22 -0500
Subject: [PATCH] Allow testing object-storage with native pict-rs

---
 dev.toml                                 |  9 ++++++
 docker/object-storage/docker-compose.yml | 40 ++++++++++++------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/dev.toml b/dev.toml
index ea58702..85af377 100644
--- a/dev.toml
+++ b/dev.toml
@@ -35,3 +35,12 @@ cache_capacity = 67108864
 [store]
 type = 'filesystem'
 path = 'data/files-local'
+
+# [store]
+# type = 'object_storage'
+# endpoint = 'http://localhost:3900'
+# use_path_style = true
+# bucket_name = 'pict-rs'
+# region = 'garage'
+# access_key = 'GK75d220d95cac26da41a574c6'
+# secret_key = '96fa2dc421aaa0026a7e651764958be111fdfdf5260c405b38d85a85f5cd9ea0'
diff --git a/docker/object-storage/docker-compose.yml b/docker/object-storage/docker-compose.yml
index 3858956..322a91f 100644
--- a/docker/object-storage/docker-compose.yml
+++ b/docker/object-storage/docker-compose.yml
@@ -1,28 +1,28 @@
 version: '3.3'
 
 services:
-  pictrs:
-    build:
-      context: .
-      dockerfile: ./Dockerfile
-      args:
-        UID: "${USER_ID:-1000}"
-        GID: "${GROUP_ID:-1000}"
-    ports:
-      - "8080:8080"
-      - "6669:6669"
-    environment:
-      - PICTRS__TRACING__CONSOLE__ADDRESS=0.0.0.0:6669
-      - PICTRS__TRACING__OPENTELEMETRY__URL=http://otel:4137
-      - RUST_BACKTRACE=1
-    stdin_open: true
-    tty: true
-    volumes:
-      - ./storage/pict-rs:/mnt
-      - ../../:/opt/app
+  #  pictrs:
+  #    build:
+  #      context: .
+  #      dockerfile: ./Dockerfile
+  #      args:
+  #        UID: "${USER_ID:-1000}"
+  #        GID: "${GROUP_ID:-1000}"
+  #    ports:
+  #      - "8080:8080"
+  #      - "6669:6669"
+  #    environment:
+  #      - PICTRS__TRACING__CONSOLE__ADDRESS=0.0.0.0:6669
+  #      - PICTRS__TRACING__OPENTELEMETRY__URL=http://otel:4137
+  #      - RUST_BACKTRACE=1
+  #    stdin_open: true
+  #    tty: true
+  #    volumes:
+  #      - ./storage/pict-rs:/mnt
+  #      - ../../:/opt/app
 
   pictrs_proxy:
-    image: asonix/pictrs-proxy:0.4.0-beta.1
+    image: asonix/pictrs-proxy:0.4.0-rc.2
     ports:
       - "8081:8081"
     environment: