The armv6 builds need a specific location for the libatomic.a file.
This commit fixes that by adding a RUSTFLAGS argument for this.
Also removed the link-arg=-s since this is now already done during via the release profile
And removed the CFLAGS for armv7, this is already fixed by default in the blackdex/rust-musl images.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
## 📋 Pull Request Information
**Original PR:** https://github.com/dani-garcia/vaultwarden/pull/2397
**Author:** [@BlackDex](https://github.com/BlackDex)
**Created:** 3/27/2022
**Status:** ✅ Merged
**Merged:** 3/27/2022
**Merged by:** [@dani-garcia](https://github.com/dani-garcia)
**Base:** `main` ← **Head:** `fix-mimalloc-build`
---
### 📝 Commits (1)
- [`d98f95f`](https://github.com/dani-garcia/vaultwarden/commit/d98f95f5363d62c0915f175eea04302c0dba9d9e) Fix building mimalloc on armv6
### 📊 Changes
**9 files changed** (+20 additions, -21 deletions)
<details>
<summary>View changed files</summary>
📝 `docker/Dockerfile.j2` (+4 -5)
📝 `docker/amd64/Dockerfile.alpine` (+0 -1)
📝 `docker/amd64/Dockerfile.buildx.alpine` (+0 -1)
📝 `docker/arm64/Dockerfile.alpine` (+2 -2)
📝 `docker/arm64/Dockerfile.buildx.alpine` (+2 -2)
📝 `docker/armv6/Dockerfile.alpine` (+4 -2)
📝 `docker/armv6/Dockerfile.buildx.alpine` (+4 -2)
📝 `docker/armv7/Dockerfile.alpine` (+2 -3)
📝 `docker/armv7/Dockerfile.buildx.alpine` (+2 -3)
</details>
### 📄 Description
The armv6 builds need a specific location for the libatomic.a file.
This commit fixes that by adding a RUSTFLAGS argument for this.
Also removed the `link-arg=-s` since this is now already done during via the release profile
And removed the CFLAGS for armv7, this is already fixed by default in the blackdex/rust-musl images.
---
<sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
📋 Pull Request Information
Original PR: https://github.com/dani-garcia/vaultwarden/pull/2397
Author: @BlackDex
Created: 3/27/2022
Status: ✅ Merged
Merged: 3/27/2022
Merged by: @dani-garcia
Base:
main← Head:fix-mimalloc-build📝 Commits (1)
d98f95fFix building mimalloc on armv6📊 Changes
9 files changed (+20 additions, -21 deletions)
View changed files
📝
docker/Dockerfile.j2(+4 -5)📝
docker/amd64/Dockerfile.alpine(+0 -1)📝
docker/amd64/Dockerfile.buildx.alpine(+0 -1)📝
docker/arm64/Dockerfile.alpine(+2 -2)📝
docker/arm64/Dockerfile.buildx.alpine(+2 -2)📝
docker/armv6/Dockerfile.alpine(+4 -2)📝
docker/armv6/Dockerfile.buildx.alpine(+4 -2)📝
docker/armv7/Dockerfile.alpine(+2 -3)📝
docker/armv7/Dockerfile.buildx.alpine(+2 -3)📄 Description
The armv6 builds need a specific location for the libatomic.a file.
This commit fixes that by adding a RUSTFLAGS argument for this.
Also removed the
link-arg=-ssince this is now already done during via the release profileAnd removed the CFLAGS for armv7, this is already fixed by default in the blackdex/rust-musl images.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.