diff --git a/docker/object-storage/docker-compose.yml b/docker/object-storage/docker-compose.yml index 9f1f905..ac82284 100644 --- a/docker/object-storage/docker-compose.yml +++ b/docker/object-storage/docker-compose.yml @@ -14,8 +14,6 @@ services: environment: - PICTRS__TRACING__CONSOLE__ADDRESS=0.0.0.0:6669 - PICTRS__TRACING__OPENTELEMETRY__URL=http://otel:4137 - links: - - "minio:pict-rs.minio" stdin_open: true tty: true volumes: @@ -23,7 +21,7 @@ services: - ../../:/opt/app pictrs_proxy: - image: asonix/pictrs-proxy:0.3 + image: asonix/pictrs-proxy:0.4.0-alpha.4 ports: - "8081:8081" environment: diff --git a/docker/object-storage/otel.yml b/docker/object-storage/otel.yml index 8270b08..91168c3 100644 --- a/docker/object-storage/otel.yml +++ b/docker/object-storage/otel.yml @@ -11,7 +11,8 @@ exporters: logging: jaeger: endpoint: jaeger:14250 - insecure: true + tls: + insecure: true service: pipelines: diff --git a/docker/object-storage/pict-rs.toml b/docker/object-storage/pict-rs.toml index f710493..426f3fb 100644 --- a/docker/object-storage/pict-rs.toml +++ b/docker/object-storage/pict-rs.toml @@ -1,6 +1,7 @@ [server] address = '0.0.0.0:8080' worker_id = 'pict-rs-1' + [tracing.logging] format = 'normal' targets = 'warn,tracing_actix_web=info,actix_server=info,actix_web=info' @@ -21,13 +22,7 @@ max_height = 10000 max_area = 40000000 max_file_size = 40 enable_silent_video = true -filters = [ - 'blur', - 'crop', - 'identity', - 'resize', - 'thumbnail', -] +filters = ['blur', 'crop', 'identity', 'resize', 'thumbnail'] skip_validate_imports = false [repo] @@ -37,7 +32,9 @@ cache_capacity = 67108864 [store] type = 'object_storage' +endpoint = 'http://minio:9000' +use_path_style = true bucket_name = 'pict-rs' -region = 'http://minio:9000' -access_key = 'Q7Z3AY3JO01N27UNH5IR' -secret_key = 'bH3Kj6UVJF+btBtWsExVurN3ukEilC3saECsupzi' +region = 'minio' +access_key = 'pictrs' +secret_key = 'pictrspass'