khairul169/garage-webui
1
0
Fork 0
mirror of https://github.com/khairul169/garage-webui.git synced 2025-06-14 20:59:32 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 5f0f200c035acf29ec3e11a35b03aabd587d30be into b2bc905e3cf8163cc8dc55f0c87941e2034a77b1

Browse Source
This commit is contained in:
Jason Yang 2025-06-03 23:23:10 -07:00 committed by GitHub
commit fbdbc4a0c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -21,6 +21,12 @@ RUN make
FROM scratch FROM scratch
COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=ghcr.io/tarampampam/curl:8.6.0 /bin/curl /bin/curl
COPY --from=backend /app/main /bin/main COPY --from=backend /app/main /bin/main
CMD [ "/bin/main" ] HEALTHCHECK --interval=5m --timeout=2s --retries=3 --start-period=15s CMD [ \
"curl", "--fail", "http://127.0.0.1:3909" \
]
ENTRYPOINT [ "main" ]

15
backend/router/browse.go
View File

@ -331,15 +331,26 @@ func getS3Client(bucket string) (*s3.Client, error) {
return nil, fmt.Errorf("cannot get credentials for bucket %s: %w", bucket, err) return nil, fmt.Errorf("cannot get credentials for bucket %s: %w", bucket, err)
} }
// Determine endpoint and whether to disable HTTPS
endpoint := utils.Garage.GetS3Endpoint()
disableHTTPS := !strings.HasPrefix(endpoint, "https://")
// AWS config without BaseEndpoint
awsConfig := aws.Config{ awsConfig := aws.Config{
Credentials: creds, Credentials: creds,
Region: utils.Garage.GetS3Region(), Region: utils.Garage.GetS3Region(),
BaseEndpoint: aws.String(utils.Garage.GetS3Endpoint()),
} }
// Build S3 client with custom endpoint resolver for proper signing
client := s3.NewFromConfig(awsConfig, func(o *s3.Options) { client := s3.NewFromConfig(awsConfig, func(o *s3.Options) {
o.UsePathStyle = true o.UsePathStyle = true
o.EndpointOptions.DisableHTTPS = true o.EndpointOptions.DisableHTTPS = disableHTTPS
o.EndpointResolver = s3.EndpointResolverFunc(func(region string, opts s3.EndpointResolverOptions) (aws.Endpoint, error) {
return aws.Endpoint{
URL: endpoint,
SigningRegion: utils.Garage.GetS3Region(),
}, nil
})
}) })
return client, nil return client, nil