Get garage environment working again

This commit is contained in:
asonix 2023-07-11 18:00:08 -05:00
parent 943c4d5b58
commit 0f0a446ecf
3 changed files with 9 additions and 7 deletions

View file

@ -21,13 +21,13 @@ services:
# - ./storage/pict-rs:/mnt # - ./storage/pict-rs:/mnt
# - ../../:/opt/app # - ../../:/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: minio:
image: quay.io/minio/minio image: quay.io/minio/minio

View file

@ -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 }') 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 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 cat > pict-rs-garage.toml <<EOF
[server] [server]

View file

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