1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-31 20:28:31 +00:00

feat: Almost-functional musl builds on Alpine

Lots of fiddling, still can't get stuff to work

Next step is a debian builder copying the static libs from alpine
This commit is contained in:
Jade Ellis 2025-07-24 23:22:07 +01:00
parent 205506f206
commit 87be4d1a52
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
3 changed files with 5 additions and 25 deletions

23
Cargo.lock generated
View file

@ -525,24 +525,6 @@ dependencies = [
"which", "which",
] ]
[[package]]
name = "bindgen"
version = "0.71.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
dependencies = [
"bitflags 2.9.1",
"cexpr",
"clang-sys",
"itertools 0.13.0",
"proc-macro2",
"quote",
"regex",
"rustc-hash 2.1.1",
"shlex",
"syn",
]
[[package]] [[package]]
name = "bindgen" name = "bindgen"
version = "0.72.0" version = "0.72.0"
@ -4146,7 +4128,7 @@ dependencies = [
[[package]] [[package]]
name = "rust-librocksdb-sys" name = "rust-librocksdb-sys"
version = "0.38.0+10.4.2" version = "0.38.0+10.4.2"
source = "git+https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1?rev=01e1128898fc4bbb776e7a6deec2aa3b675b0442#01e1128898fc4bbb776e7a6deec2aa3b675b0442" source = "git+https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1?rev=99b0319416b64830dd6f8943e1f65e15aeef18bc#99b0319416b64830dd6f8943e1f65e15aeef18bc"
dependencies = [ dependencies = [
"bindgen 0.72.0", "bindgen 0.72.0",
"bzip2-sys", "bzip2-sys",
@ -4163,7 +4145,7 @@ dependencies = [
[[package]] [[package]]
name = "rust-rocksdb" name = "rust-rocksdb"
version = "0.42.1" version = "0.42.1"
source = "git+https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1?rev=01e1128898fc4bbb776e7a6deec2aa3b675b0442#01e1128898fc4bbb776e7a6deec2aa3b675b0442" source = "git+https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1?rev=99b0319416b64830dd6f8943e1f65e15aeef18bc#99b0319416b64830dd6f8943e1f65e15aeef18bc"
dependencies = [ dependencies = [
"libc", "libc",
"rust-librocksdb-sys", "rust-librocksdb-sys",
@ -6347,7 +6329,6 @@ version = "2.0.15+zstd.1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
dependencies = [ dependencies = [
"bindgen 0.71.1",
"cc", "cc",
"pkg-config", "pkg-config",
] ]

View file

@ -391,7 +391,7 @@ features = [
[workspace.dependencies.rust-rocksdb] [workspace.dependencies.rust-rocksdb]
git = "https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1" git = "https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1"
rev = "01e1128898fc4bbb776e7a6deec2aa3b675b0442" rev = "99b0319416b64830dd6f8943e1f65e15aeef18bc"
default-features = false default-features = false
features = [ features = [
"multi-threaded-cf", "multi-threaded-cf",

View file

@ -13,7 +13,7 @@ FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-alpine${ALPINE_VERSION} AS t
RUN --mount=type=cache,target=/etc/apk/cache apk add \ RUN --mount=type=cache,target=/etc/apk/cache apk add \
build-base pkgconfig make jq bash \ build-base pkgconfig make jq bash \
curl git file \ curl git file \
llvm-dev clang clang-dev lld llvm-dev clang clang-static lld
# Developer tool versions # Developer tool versions
@ -37,8 +37,7 @@ COPY --from=xx / /
ARG TARGETPLATFORM ARG TARGETPLATFORM
# Install libraries linked by the binary # Install libraries linked by the binary
RUN --mount=type=cache,target=/etc/apk/cache xx-apk add musl-dev liburing-dev clang-dev RUN --mount=type=cache,target=/etc/apk/cache xx-apk add musl-dev gcc g++ liburing-dev
# Set up Rust toolchain # Set up Rust toolchain
WORKDIR /app WORKDIR /app