[PR #3958] [MERGED] Container building changes #8298

New Issue

Closed

opened 2026-04-16 12:21:58 -05:00 by GiteaMirror · 0 comments

GiteaMirror commented 2026-04-16 12:21:58 -05:00

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/3958
Author: @BlackDex
Created: 10/5/2023
Status: ✅ Merged
Merged: 10/22/2023
Merged by: @dani-garcia

Base: main ← Head: release-build-revision

---

📝 Commits (4)

• 685a75f WIP: Container building changes
• a85417d Small updates
• a765481 Update GitHub Actions Workflow
• 79903d2 Address review remarks and small updates

📊 Changes

43 files changed (+1744 additions, -2949 deletions)

View changed files

📝 .github/workflows/build.yml (+10 -27)
📝 .github/workflows/hadolint.yml (+1 -2)
📝 .github/workflows/release.yml (+70 -135)
📝 .hadolint.yaml (+4 -2)
📝 .pre-commit-config.yaml (+1 -1)
📝 Cargo.lock (+507 -292)
📝 Cargo.toml (+33 -27)
📝 Dockerfile (+1 -1)
➕ docker/DockerSettings.yaml (+28 -0)
➕ docker/Dockerfile.alpine (+160 -0)
➖ docker/Dockerfile.buildx (+0 -34)
➕ docker/Dockerfile.debian (+194 -0)
📝 docker/Dockerfile.j2 (+148 -153)
📝 docker/Makefile (+4 -15)
📝 docker/README.md (+182 -2)
➖ docker/amd64/Dockerfile (+0 -119)
➖ docker/amd64/Dockerfile.alpine (+0 -116)
➖ docker/amd64/Dockerfile.buildkit (+0 -119)
➖ docker/amd64/Dockerfile.buildkit.alpine (+0 -116)
➖ docker/arm64/Dockerfile (+0 -141)

...and 23 more files

📄 Description

Rework the container building.

• Use docker buildx bake instead of custom build/push scripts
• Just two Dockerfile's one for Debian and one for Alpine
• Pinned openssl-sys version to v0.9.92, higher versions break Alpine builds (https://github.com/sfackler/rust-openssl/issues/2043)
• Updated release workflow
• Created documentation on how to use bake
• Created a helper script bake.sh to easily bake/build the images (Read the documentation)
• Created a podman helper script podman-bake.sh which uses podman instead of docker.
• Updated the web-vault to v2023.9.1

I needed to change some way's to install the packages for MariaDB/MySQL, since on armv6/armel Debian it causes issues.
By downloading them and force installing via dpkg the build process still works on all platforms.

All images are tested using QEMU and also run the Favicon DDoS on all these images to verify it doesn't segfault.
The Alpine build images are now downloaded from ghcr.io instead of docker.io, maybe it helps in speed, but probably doesn't matter.

The runtime images are no longer a version maintained by Balena, they were sometimes outdated like there Alpine version was for a long time. And it also had a static qemu binary in there which only makes the image larger. Now we use the official images from both Debian and Alpine.

Also switched to the -slim rust building container, this has all the needed packages pre-installed (except for pkg-config).

Also:

• Updated Rust to v1.73.0 (and MSRV to v1.71.1)
• Updated all the crates possible

Fixes #3839
Fixes #3912
Fixes #3957

---

_{🔄 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/3958 **Author:** [@BlackDex](https://github.com/BlackDex) **Created:** 10/5/2023 **Status:** ✅ Merged **Merged:** 10/22/2023 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `release-build-revision` --- ### 📝 Commits (4) - [`685a75f`](https://github.com/dani-garcia/vaultwarden/commit/685a75f07d53f4f4d6160ec0120f7875d0abde08) WIP: Container building changes - [`a85417d`](https://github.com/dani-garcia/vaultwarden/commit/a85417d25b1ef3a0d04e3d26312cf92ca7d020f2) Small updates - [`a765481`](https://github.com/dani-garcia/vaultwarden/commit/a765481b05e751409416b6ce76278f09c6f9f3b2) Update GitHub Actions Workflow - [`79903d2`](https://github.com/dani-garcia/vaultwarden/commit/79903d241b41befb04f4195fbdd37244b60cf6e9) Address review remarks and small updates ### 📊 Changes **43 files changed** (+1744 additions, -2949 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/build.yml` (+10 -27) 📝 `.github/workflows/hadolint.yml` (+1 -2) 📝 `.github/workflows/release.yml` (+70 -135) 📝 `.hadolint.yaml` (+4 -2) 📝 `.pre-commit-config.yaml` (+1 -1) 📝 `Cargo.lock` (+507 -292) 📝 `Cargo.toml` (+33 -27) 📝 `Dockerfile` (+1 -1) ➕ `docker/DockerSettings.yaml` (+28 -0) ➕ `docker/Dockerfile.alpine` (+160 -0) ➖ `docker/Dockerfile.buildx` (+0 -34) ➕ `docker/Dockerfile.debian` (+194 -0) 📝 `docker/Dockerfile.j2` (+148 -153) 📝 `docker/Makefile` (+4 -15) 📝 `docker/README.md` (+182 -2) ➖ `docker/amd64/Dockerfile` (+0 -119) ➖ `docker/amd64/Dockerfile.alpine` (+0 -116) ➖ `docker/amd64/Dockerfile.buildkit` (+0 -119) ➖ `docker/amd64/Dockerfile.buildkit.alpine` (+0 -116) ➖ `docker/arm64/Dockerfile` (+0 -141) _...and 23 more files_ </details> ### 📄 Description Rework the container building. - Use `docker buildx bake` instead of custom build/push scripts - Just two Dockerfile's one for Debian and one for Alpine - Pinned openssl-sys version to v0.9.92, higher versions break Alpine builds (https://github.com/sfackler/rust-openssl/issues/2043) - Updated release workflow - Created documentation on how to use bake - Created a helper script `bake.sh` to easily bake/build the images (Read the documentation) - Created a podman helper script `podman-bake.sh` which uses podman instead of docker. - Updated the web-vault to v2023.9.1 I needed to change some way's to install the packages for MariaDB/MySQL, since on armv6/armel Debian it causes issues. By downloading them and force installing via `dpkg` the build process still works on all platforms. All images are tested using QEMU and also run the Favicon DDoS on all these images to verify it doesn't segfault. The Alpine build images are now downloaded from ghcr.io instead of docker.io, maybe it helps in speed, but probably doesn't matter. The runtime images are no longer a version maintained by Balena, they were sometimes outdated like there Alpine version was for a long time. And it also had a static qemu binary in there which only makes the image larger. Now we use the official images from both Debian and Alpine. Also switched to the `-slim` rust building container, this has all the needed packages pre-installed (except for pkg-config). Also: - Updated Rust to v1.73.0 (and MSRV to v1.71.1) - Updated all the crates possible Fixes #3839 Fixes #3912 Fixes #3957 --- _{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

GiteaMirror added the pull-request label 2026-04-16 12:21:58 -05:00

GiteaMirror closed this issue 2026-04-16 12:21:59 -05:00

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

main

revert-7033-patch-1

cached-config-operations

test_dylint

1.36.0

1.35.8

1.35.7

1.35.6

1.35.5

1.35.4

1.35.3

1.35.2

1.35.1

1.35.0

1.34.3

1.34.2

1.34.1

1.34.0

1.33.2

1.33.1

1.33.0

1.32.7

1.32.6

1.32.5

1.32.4

1.32.3

1.32.2

1.32.1

1.32.0

1.31.0

1.30.5

1.30.4

1.30.3

1.30.2

1.30.1

1.30.0

1.29.2

1.29.1

1.29.0

1.28.1

1.28.0

1.27.0

1.26.0

1.25.2

1.25.1

1.25.0

1.24.0

1.23.1

1.23.0

1.22.2

1.22.1

1.22.0

1.21.0

1.20.0

1.19.0

1.18.0

1.17.0

1.16.3

1.16.2

1.16.1

1.16.0

1.15.1

1.15.0

1.14.2

1.14.1

1.14

1.13.1

1.13.0

1.12.0

1.11.0

1.10.0

1.9.1

1.9.0

1.8.0

1.7.0

1.6.1

1.6.0

1.5.0

1.4.0

1.3.0

1.2.0

1.1.0

1.0.0

0.13.0

0.12.0

0.11.0

0.10.0

0.9.0

Labels

Clear labels

better for forum

bug

documentation

duplicate

enhancement

future Vault

good first issue

help wanted

low priority

notes

pull-request

Mirrored from GitHub Pull Request

question

SSO

Third party

troubleshooting

wontfix

No Label pull-request

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

GiteaMirror ninjasurge

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/vaultwarden#8298