[PR #784] [MERGED] Use Debian base image for all steps of the build process #2666

New Issue

Closed

opened 2025-11-07 07:51:15 -06:00 by GiteaMirror · 0 comments

GiteaMirror commented 2025-11-07 07:51:15 -06:00

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/784
Author: @ypid
Created: 12/28/2019
Status: ✅ Merged
Merged: 1/5/2020
Merged by: @dani-garcia

Base: master ← Head: docker/use-debian-base

---

📝 Commits (10+)

• f250c54 WIP: Use Debian base image for all steps of the build process
• 8280d20 Generate Dockerfiles from one source for maintainability. Closes #785.
• 43aa75d Fix cross platform build support, thanks to @dani-garcia for the review
• 0f0e587 Move dpkg --add-architecture before the first apt call
• 47a5a4e Fix package name for Ubuntu 16.04 based image. Thanks @dani-garcia!
• 7a0bb18 Make cargo new independent of workdir to be exact
• 43adcde Move rustup target before cargo build. Thanks to @dani-garcia!
• 078b21d Fix armv6 build, thanks to @dani-garcia for the review!
• 1698b43 Readd missing cargo setup for armv7. Thanks to @dani-garcia!
• 146525d Improve Jinja2 template logic a bit

📊 Changes

15 files changed (+851 additions, -170 deletions)

View changed files

➕ docker/Dockerfile.j2 (+322 -0)
➕ docker/Makefile (+9 -0)
📝 docker/aarch64/mysql/Dockerfile (+60 -20)
📝 docker/aarch64/sqlite/Dockerfile (+55 -20)
📝 docker/amd64/mysql/Dockerfile (+24 -7)
📝 docker/amd64/mysql/Dockerfile.alpine (+30 -7)
📝 docker/amd64/postgresql/Dockerfile (+26 -16)
📝 docker/amd64/postgresql/Dockerfile.alpine (+30 -8)
📝 docker/amd64/sqlite/Dockerfile (+25 -8)
📝 docker/amd64/sqlite/Dockerfile.alpine (+29 -7)
📝 docker/armv6/mysql/Dockerfile (+59 -19)
📝 docker/armv6/sqlite/Dockerfile (+54 -19)
📝 docker/armv7/mysql/Dockerfile (+58 -20)
📝 docker/armv7/sqlite/Dockerfile (+53 -19)
➕ docker/render_template (+17 -0)

📄 Description

No need to use two different base images. Debian buster is pulled later anyway so we can just use it for the vault stage as well.

My reason for this change is partly to avoid redundancy and partly to make it easier to build everything yourself. When all the build environment is based on Debian than you just have to figure out how to build a Debian Docker base image (ref: https://github.com/ypid/docker-makefile).

WIP: This PR is incomplete. I first wanted to check if this is acceptable two you because I put together a short script to replace this in all the Dockerfiles.

I assume the broken windows CI build is not my fault. Why support Windows anyway ;-)

---

_{🔄 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/784 **Author:** [@ypid](https://github.com/ypid) **Created:** 12/28/2019 **Status:** ✅ Merged **Merged:** 1/5/2020 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `master` ← **Head:** `docker/use-debian-base` --- ### 📝 Commits (10+) - [`f250c54`](https://github.com/dani-garcia/vaultwarden/commit/f250c5481302280360a89c25a5fd02607b91c53f) WIP: Use Debian base image for all steps of the build process - [`8280d20`](https://github.com/dani-garcia/vaultwarden/commit/8280d200ea6c39757783f02756eb45141d3e50fe) Generate Dockerfiles from one source for maintainability. Closes #785. - [`43aa75d`](https://github.com/dani-garcia/vaultwarden/commit/43aa75dc89c60a994ed89a93b44622f01e9b90ba) Fix cross platform build support, thanks to @dani-garcia for the review - [`0f0e587`](https://github.com/dani-garcia/vaultwarden/commit/0f0e5876aeaae3a97773540dc90b05daa9d462f4) Move `dpkg --add-architecture` before the first apt call - [`47a5a4e`](https://github.com/dani-garcia/vaultwarden/commit/47a5a4e1fcba7c89e6fba90a23c05b6353b0c013) Fix package name for Ubuntu 16.04 based image. Thanks @dani-garcia! - [`7a0bb18`](https://github.com/dani-garcia/vaultwarden/commit/7a0bb18dcfc3855baa5c4019f159cbfc42f4e8aa) Make `cargo new` independent of workdir to be exact - [`43adcde`](https://github.com/dani-garcia/vaultwarden/commit/43adcde0946da746aaf99f31012a5c00c517b850) Move `rustup target` before `cargo build`. Thanks to @dani-garcia! - [`078b21d`](https://github.com/dani-garcia/vaultwarden/commit/078b21db85b26595aa0f4d880b7f6a60a2c75504) Fix armv6 build, thanks to @dani-garcia for the review! - [`1698b43`](https://github.com/dani-garcia/vaultwarden/commit/1698b43f9bb6ea3f82db58e956f05dbbc002fe1b) Readd missing cargo setup for armv7. Thanks to @dani-garcia! - [`146525d`](https://github.com/dani-garcia/vaultwarden/commit/146525db9195f1be45aff8b7b0abfc0970392c8b) Improve Jinja2 template logic a bit ### 📊 Changes **15 files changed** (+851 additions, -170 deletions) <details> <summary>View changed files</summary> ➕ `docker/Dockerfile.j2` (+322 -0) ➕ `docker/Makefile` (+9 -0) 📝 `docker/aarch64/mysql/Dockerfile` (+60 -20) 📝 `docker/aarch64/sqlite/Dockerfile` (+55 -20) 📝 `docker/amd64/mysql/Dockerfile` (+24 -7) 📝 `docker/amd64/mysql/Dockerfile.alpine` (+30 -7) 📝 `docker/amd64/postgresql/Dockerfile` (+26 -16) 📝 `docker/amd64/postgresql/Dockerfile.alpine` (+30 -8) 📝 `docker/amd64/sqlite/Dockerfile` (+25 -8) 📝 `docker/amd64/sqlite/Dockerfile.alpine` (+29 -7) 📝 `docker/armv6/mysql/Dockerfile` (+59 -19) 📝 `docker/armv6/sqlite/Dockerfile` (+54 -19) 📝 `docker/armv7/mysql/Dockerfile` (+58 -20) 📝 `docker/armv7/sqlite/Dockerfile` (+53 -19) ➕ `docker/render_template` (+17 -0) </details> ### 📄 Description No need to use two different base images. Debian buster is pulled later anyway so we can just use it for the vault stage as well. My reason for this change is partly to avoid redundancy and partly to make it easier to build everything yourself. When all the build environment is based on Debian than you just have to figure out how to build a Debian Docker base image (ref: https://github.com/ypid/docker-makefile). ~~WIP: This PR is incomplete. I first wanted to check if this is acceptable two you because I put together a short script to replace this in all the Dockerfiles.~~ I assume the broken windows CI build is not my fault. Why support Windows anyway ;-) --- _{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

GiteaMirror added the pull-request label 2025-11-07 07:51:15 -06:00

GiteaMirror closed this issue 2025-11-07 07:51:16 -06:00

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

main

cached-config-operations

test_dylint

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#2666