diff --git a/Cargo.lock b/Cargo.lock index 725ce573..0b2483bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3556,8 +3556,8 @@ dependencies = [ [[package]] name = "rust-librocksdb-sys" -version = "0.33.0+9.11.1" -source = "git+https://github.com/matrix-construct/rust-rocksdb?rev=cca241c5ca48f7c7f5c1469294f11dc156dd987a#cca241c5ca48f7c7f5c1469294f11dc156dd987a" +version = "0.37.0+10.2.1" +source = "git+https://github.com/matrix-construct/rust-rocksdb?rev=225a42519276e502205bdc845cebdb22d70ee245#225a42519276e502205bdc845cebdb22d70ee245" dependencies = [ "bindgen 0.71.1", "bzip2-sys", @@ -3573,8 +3573,8 @@ dependencies = [ [[package]] name = "rust-rocksdb" -version = "0.37.0" -source = "git+https://github.com/matrix-construct/rust-rocksdb?rev=cca241c5ca48f7c7f5c1469294f11dc156dd987a#cca241c5ca48f7c7f5c1469294f11dc156dd987a" +version = "0.41.0" +source = "git+https://github.com/matrix-construct/rust-rocksdb?rev=225a42519276e502205bdc845cebdb22d70ee245#225a42519276e502205bdc845cebdb22d70ee245" dependencies = [ "libc", "rust-librocksdb-sys", @@ -4380,7 +4380,7 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" version = "0.6.0" -source = "git+https://github.com/matrix-construct/jemallocator?rev=82af58d6a13ddd5dcdc7d4e91eae3b63292995b8#82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +source = "git+https://github.com/matrix-construct/jemallocator?rev=03bed96afbbc898bef4d4f7d335c0519e3d1afad#03bed96afbbc898bef4d4f7d335c0519e3d1afad" dependencies = [ "libc", "paste", @@ -4390,7 +4390,7 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" -source = "git+https://github.com/matrix-construct/jemallocator?rev=82af58d6a13ddd5dcdc7d4e91eae3b63292995b8#82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +source = "git+https://github.com/matrix-construct/jemallocator?rev=03bed96afbbc898bef4d4f7d335c0519e3d1afad#03bed96afbbc898bef4d4f7d335c0519e3d1afad" dependencies = [ "cc", "libc", @@ -4399,7 +4399,7 @@ dependencies = [ [[package]] name = "tikv-jemallocator" version = "0.6.0" -source = "git+https://github.com/matrix-construct/jemallocator?rev=82af58d6a13ddd5dcdc7d4e91eae3b63292995b8#82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +source = "git+https://github.com/matrix-construct/jemallocator?rev=03bed96afbbc898bef4d4f7d335c0519e3d1afad#03bed96afbbc898bef4d4f7d335c0519e3d1afad" dependencies = [ "libc", "tikv-jemalloc-sys", diff --git a/Cargo.toml b/Cargo.toml index 530b779b..99000cf0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -354,7 +354,7 @@ default-features = false [workspace.dependencies.rust-rocksdb] git = "https://github.com/matrix-construct/rust-rocksdb" -rev = "cca241c5ca48f7c7f5c1469294f11dc156dd987a" +rev = "225a42519276e502205bdc845cebdb22d70ee245" default-features = false features = [ "multi-threaded-cf", @@ -459,7 +459,7 @@ default-features = false [workspace.dependencies.tikv-jemallocator] git = "https://github.com/matrix-construct/jemallocator" -rev = "82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +rev = "03bed96afbbc898bef4d4f7d335c0519e3d1afad" default-features = false features = [ "background_threads_runtime_support", @@ -468,13 +468,13 @@ features = [ [workspace.dependencies.tikv-jemalloc-ctl] git = "https://github.com/matrix-construct/jemallocator" -rev = "82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +rev = "03bed96afbbc898bef4d4f7d335c0519e3d1afad" default-features = false features = ["use_std"] [workspace.dependencies.tikv-jemalloc-sys] git = "https://github.com/matrix-construct/jemallocator" -rev = "82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +rev = "03bed96afbbc898bef4d4f7d335c0519e3d1afad" default-features = false features = [ "background_threads_runtime_support", diff --git a/docker/Dockerfile.rocksdb b/docker/Dockerfile.rocksdb index 41786aaa..3427de67 100644 --- a/docker/Dockerfile.rocksdb +++ b/docker/Dockerfile.rocksdb @@ -1,6 +1,9 @@ # syntax = docker/dockerfile:1.11-labs FROM input AS rocksdb-fetch +ARG rocksdb_branch="tuwunel-changes" +ARG rust_rocksdb_branch="conduwuit-changes" +ARG librocksdb_submodule="librocksdb-sys/rocksdb" WORKDIR / COPY --link --from=input . . @@ -10,12 +13,13 @@ COPY --link --from=recipe rocksdb.url . RUN < rocksdb.url sha1sum recipe.json rocksdb.url