diff options
| author | Daniel García <[email protected]> | 2023-09-22 13:48:11 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-09-22 13:48:11 -0600 |
| commit | bc26bfa589c007da9b9be37e1172060f38a948b9 (patch) | |
| tree | 335c5d68304fda63bf0ac1c8179f12e5049bdedb | |
| parent | 99a59bc4f32bc01b7b2ad9d5f0090d864a2905e3 (diff) | |
| parent | ccc51e75803dc4d3d3779cc8b0c643373da70eb9 (diff) | |
| download | vaultwarden-bc26bfa589c007da9b9be37e1172060f38a948b9.tar.gz vaultwarden-bc26bfa589c007da9b9be37e1172060f38a948b9.zip | |
Merge pull request #3911 from BlackDex/fix-arm-build
Fix arm builds
| -rw-r--r-- | docker/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/arm64/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/arm64/Dockerfile.buildkit | 1 | ||||
| -rw-r--r-- | docker/armv6/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/armv6/Dockerfile.buildkit | 1 | ||||
| -rw-r--r-- | docker/armv7/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/armv7/Dockerfile.buildkit | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index ae65db88..ab4c4ff4 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -114,6 +114,7 @@ RUN {{ mount_rust_cache -}} dpkg --add-architecture {{ package_arch_name }} \ --no-install-recommends \ gcc-{{ package_cross_compiler }} \ libc6-dev{{ package_arch_prefix }} \ + linux-libc-dev{{ package_arch_prefix }} \ libmariadb-dev{{ package_arch_prefix }} \ libmariadb-dev-compat{{ package_arch_prefix }} \ libmariadb3{{ package_arch_prefix }} \ diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile index a805a63d..910568d0 100644 --- a/docker/arm64/Dockerfile +++ b/docker/arm64/Dockerfile @@ -48,6 +48,7 @@ RUN dpkg --add-architecture arm64 \ --no-install-recommends \ gcc-aarch64-linux-gnu \ libc6-dev:arm64 \ + linux-libc-dev:arm64 \ libmariadb-dev:arm64 \ libmariadb-dev-compat:arm64 \ libmariadb3:arm64 \ diff --git a/docker/arm64/Dockerfile.buildkit b/docker/arm64/Dockerfile.buildkit index a93dc844..7f370c4e 100644 --- a/docker/arm64/Dockerfile.buildkit +++ b/docker/arm64/Dockerfile.buildkit @@ -48,6 +48,7 @@ RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/. --no-install-recommends \ gcc-aarch64-linux-gnu \ libc6-dev:arm64 \ + linux-libc-dev:arm64 \ libmariadb-dev:arm64 \ libmariadb-dev-compat:arm64 \ libmariadb3:arm64 \ diff --git a/docker/armv6/Dockerfile b/docker/armv6/Dockerfile index 93af7729..6480c9a6 100644 --- a/docker/armv6/Dockerfile +++ b/docker/armv6/Dockerfile @@ -48,6 +48,7 @@ RUN dpkg --add-architecture armel \ --no-install-recommends \ gcc-arm-linux-gnueabi \ libc6-dev:armel \ + linux-libc-dev:armel \ libmariadb-dev:armel \ libmariadb-dev-compat:armel \ libmariadb3:armel \ diff --git a/docker/armv6/Dockerfile.buildkit b/docker/armv6/Dockerfile.buildkit index e40bec21..6211d9a3 100644 --- a/docker/armv6/Dockerfile.buildkit +++ b/docker/armv6/Dockerfile.buildkit @@ -48,6 +48,7 @@ RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/. --no-install-recommends \ gcc-arm-linux-gnueabi \ libc6-dev:armel \ + linux-libc-dev:armel \ libmariadb-dev:armel \ libmariadb-dev-compat:armel \ libmariadb3:armel \ diff --git a/docker/armv7/Dockerfile b/docker/armv7/Dockerfile index c9949cad..b5174133 100644 --- a/docker/armv7/Dockerfile +++ b/docker/armv7/Dockerfile @@ -48,6 +48,7 @@ RUN dpkg --add-architecture armhf \ --no-install-recommends \ gcc-arm-linux-gnueabihf \ libc6-dev:armhf \ + linux-libc-dev:armhf \ libmariadb-dev:armhf \ libmariadb-dev-compat:armhf \ libmariadb3:armhf \ diff --git a/docker/armv7/Dockerfile.buildkit b/docker/armv7/Dockerfile.buildkit index 2000dc6d..aa291135 100644 --- a/docker/armv7/Dockerfile.buildkit +++ b/docker/armv7/Dockerfile.buildkit @@ -48,6 +48,7 @@ RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/. --no-install-recommends \ gcc-arm-linux-gnueabihf \ libc6-dev:armhf \ + linux-libc-dev:armhf \ libmariadb-dev:armhf \ libmariadb-dev-compat:armhf \ libmariadb3:armhf \ |