From 53188a119163d7e6987cef5014aac36c1396be9b Mon Sep 17 00:00:00 2001 From: chrislu Date: Mon, 1 Jan 2024 22:41:23 -0800 Subject: [PATCH 1/2] fix rocksdb build --- docker/Dockerfile.rocksdb_dev_env | 2 +- docker/Dockerfile.rocksdb_large | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.rocksdb_dev_env b/docker/Dockerfile.rocksdb_dev_env index fc67e8ddd..2dd573869 100644 --- a/docker/Dockerfile.rocksdb_dev_env +++ b/docker/Dockerfile.rocksdb_dev_env @@ -1,4 +1,4 @@ -FROM golang:1.21-buster as builder +FROM golang:1.21 as builder RUN apt-get update RUN apt-get install -y build-essential libsnappy-dev zlib1g-dev libbz2-dev libgflags-dev liblz4-dev libzstd-dev diff --git a/docker/Dockerfile.rocksdb_large b/docker/Dockerfile.rocksdb_large index 5e8dcb410..204e865ce 100644 --- a/docker/Dockerfile.rocksdb_large +++ b/docker/Dockerfile.rocksdb_large @@ -1,4 +1,4 @@ -FROM golang:1.21-buster as builder +FROM golang:1.21 as builder RUN apt-get update RUN apt-get install -y build-essential libsnappy-dev zlib1g-dev libbz2-dev libgflags-dev liblz4-dev libzstd-dev From d3688938d9e3cd050f2fb2f9943988dd2529c87e Mon Sep 17 00:00:00 2001 From: chrislu Date: Tue, 2 Jan 2024 12:55:34 -0800 Subject: [PATCH 2/2] avoid nil fix https://github.com/seaweedfs/seaweedfs/issues/5153 introduced from #5109 --- weed/command/filer.go | 1 + 1 file changed, 1 insertion(+) diff --git a/weed/command/filer.go b/weed/command/filer.go index 50fc4492b..cee886d18 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -100,6 +100,7 @@ func init() { filerS3Options.portHttps = cmdFiler.Flag.Int("s3.port.https", 0, "s3 server https listen port") filerS3Options.portGrpc = cmdFiler.Flag.Int("s3.port.grpc", 0, "s3 server grpc listen port") filerS3Options.domainName = cmdFiler.Flag.String("s3.domainName", "", "suffix of the host name in comma separated list, {bucket}.{domainName}") + filerS3Options.allowedOrigins = cmdFiler.Flag.String("s3.allowedOrigins", "*", "comma separated list of allowed origins") filerS3Options.dataCenter = cmdFiler.Flag.String("s3.dataCenter", "", "prefer to read and write to volumes in this data center") filerS3Options.tlsPrivateKey = cmdFiler.Flag.String("s3.key.file", "", "path to the TLS private key file") filerS3Options.tlsCertificate = cmdFiler.Flag.String("s3.cert.file", "", "path to the TLS certificate file")