diff options
| author | Chris Lu <chris.lu@gmail.com> | 2025-09-16 23:22:40 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2025-09-16 23:22:40 -0700 |
| commit | f9f2609e633f820f9d4e327ba83395a4e4c6b8d0 (patch) | |
| tree | 0f6398acff507db5cb153ed9177c7051f0298c8e | |
| parent | 58e0c1b3301f5c5c0723f71726b6f1053e9152f9 (diff) | |
| download | seaweedfs-f9f2609e633f820f9d4e327ba83395a4e4c6b8d0.tar.xz seaweedfs-f9f2609e633f820f9d4e327ba83395a4e4c6b8d0.zip | |
Fix RocksDB docker build
| -rw-r--r-- | .github/workflows/container_release3.yml | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.rocksdb_dev_env | 10 | ||||
| -rw-r--r-- | docker/Dockerfile.rocksdb_large | 12 |
3 files changed, 13 insertions, 11 deletions
diff --git a/.github/workflows/container_release3.yml b/.github/workflows/container_release3.yml index dafff5119..479e2f841 100644 --- a/.github/workflows/container_release3.yml +++ b/.github/workflows/container_release3.yml @@ -53,6 +53,8 @@ jobs: context: ./docker push: ${{ github.event_name != 'pull_request' }} file: ./docker/Dockerfile.rocksdb_large + build-args: | + BRANCH=${{ github.sha }} platforms: linux/amd64 tags: ${{ steps.docker_meta.outputs.tags }} labels: ${{ steps.docker_meta.outputs.labels }} diff --git a/docker/Dockerfile.rocksdb_dev_env b/docker/Dockerfile.rocksdb_dev_env index 0ff3be6d3..cb2cc2399 100644 --- a/docker/Dockerfile.rocksdb_dev_env +++ b/docker/Dockerfile.rocksdb_dev_env @@ -1,16 +1,16 @@ -FROM golang:1.24 as builder +FROM golang:1.24 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 -ENV ROCKSDB_VERSION v10.2.1 +ENV ROCKSDB_VERSION=v10.5.1 # build RocksDB RUN cd /tmp && \ git clone https://github.com/facebook/rocksdb.git /tmp/rocksdb --depth 1 --single-branch --branch $ROCKSDB_VERSION && \ cd rocksdb && \ - PORTABLE=1 make static_lib && \ + PORTABLE=1 make -j"$(nproc)" static_lib && \ make install-static -ENV CGO_CFLAGS "-I/tmp/rocksdb/include" -ENV CGO_LDFLAGS "-L/tmp/rocksdb -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -llz4 -lzstd" +ENV CGO_CFLAGS="-I/tmp/rocksdb/include" +ENV CGO_LDFLAGS="-L/tmp/rocksdb -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -llz4 -lzstd" diff --git a/docker/Dockerfile.rocksdb_large b/docker/Dockerfile.rocksdb_large index 706cd15ea..62a2a306f 100644 --- a/docker/Dockerfile.rocksdb_large +++ b/docker/Dockerfile.rocksdb_large @@ -1,24 +1,24 @@ -FROM golang:1.24 as builder +FROM golang:1.24 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 -ENV ROCKSDB_VERSION v10.2.1 +ENV ROCKSDB_VERSION=v10.5.1 # build RocksDB RUN cd /tmp && \ git clone https://github.com/facebook/rocksdb.git /tmp/rocksdb --depth 1 --single-branch --branch $ROCKSDB_VERSION && \ cd rocksdb && \ - PORTABLE=1 make static_lib && \ + PORTABLE=1 make -j"$(nproc)" static_lib && \ make install-static -ENV CGO_CFLAGS "-I/tmp/rocksdb/include" -ENV CGO_LDFLAGS "-L/tmp/rocksdb -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -llz4 -lzstd" +ENV CGO_CFLAGS="-I/tmp/rocksdb/include" +ENV CGO_LDFLAGS="-L/tmp/rocksdb -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -llz4 -lzstd" # build SeaweedFS RUN mkdir -p /go/src/github.com/seaweedfs/ RUN git clone https://github.com/seaweedfs/seaweedfs /go/src/github.com/seaweedfs/seaweedfs -ARG BRANCH=${BRANCH:-master} +ARG BRANCH=master RUN cd /go/src/github.com/seaweedfs/seaweedfs && git checkout $BRANCH RUN cd /go/src/github.com/seaweedfs/seaweedfs/weed \ && export LDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=$(git rev-parse --short HEAD)" \ |