[PR #2631] [MERGED] Fix persistent folder check within containers #2987

Closed
opened 2025-11-07 08:00:17 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/2631
Author: @BlackDex
Created: 7/19/2022
Status: Merged
Merged: 7/22/2022
Merged by: @dani-garcia

Base: mainHead: fix-2622-persistent-volume-check


📝 Commits (1)

  • 9a787dd Fix persistent folder check within containers

📊 Changes

18 files changed (+43 additions, -158 deletions)

View changed files

📝 docker/Dockerfile.j2 (+0 -9)
📝 docker/amd64/Dockerfile (+0 -9)
📝 docker/amd64/Dockerfile.alpine (+0 -9)
📝 docker/amd64/Dockerfile.buildx (+0 -9)
📝 docker/amd64/Dockerfile.buildx.alpine (+0 -9)
📝 docker/arm64/Dockerfile (+0 -9)
📝 docker/arm64/Dockerfile.alpine (+0 -9)
📝 docker/arm64/Dockerfile.buildx (+0 -9)
📝 docker/arm64/Dockerfile.buildx.alpine (+0 -9)
📝 docker/armv6/Dockerfile (+0 -9)
📝 docker/armv6/Dockerfile.alpine (+0 -9)
📝 docker/armv6/Dockerfile.buildx (+0 -9)
📝 docker/armv6/Dockerfile.buildx.alpine (+0 -9)
📝 docker/armv7/Dockerfile (+0 -9)
📝 docker/armv7/Dockerfile.alpine (+0 -9)
📝 docker/armv7/Dockerfile.buildx (+0 -9)
📝 docker/armv7/Dockerfile.buildx.alpine (+0 -9)
📝 src/main.rs (+43 -5)

📄 Description

The previous persistent folder check worked by checking if a file
exists. If you used a bind-mount, then this file is not there. But when
using a docker/podman volume those files are copied, and caused the
container to not start.

This change checks the /proc/self/mountinfo for a specific patern to
see if the data folder is persistent or not.

Fixes #2622


🔄 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/2631 **Author:** [@BlackDex](https://github.com/BlackDex) **Created:** 7/19/2022 **Status:** ✅ Merged **Merged:** 7/22/2022 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `fix-2622-persistent-volume-check` --- ### 📝 Commits (1) - [`9a787dd`](https://github.com/dani-garcia/vaultwarden/commit/9a787dd105edeea5fdb309a50f2b47155937c5ed) Fix persistent folder check within containers ### 📊 Changes **18 files changed** (+43 additions, -158 deletions) <details> <summary>View changed files</summary> 📝 `docker/Dockerfile.j2` (+0 -9) 📝 `docker/amd64/Dockerfile` (+0 -9) 📝 `docker/amd64/Dockerfile.alpine` (+0 -9) 📝 `docker/amd64/Dockerfile.buildx` (+0 -9) 📝 `docker/amd64/Dockerfile.buildx.alpine` (+0 -9) 📝 `docker/arm64/Dockerfile` (+0 -9) 📝 `docker/arm64/Dockerfile.alpine` (+0 -9) 📝 `docker/arm64/Dockerfile.buildx` (+0 -9) 📝 `docker/arm64/Dockerfile.buildx.alpine` (+0 -9) 📝 `docker/armv6/Dockerfile` (+0 -9) 📝 `docker/armv6/Dockerfile.alpine` (+0 -9) 📝 `docker/armv6/Dockerfile.buildx` (+0 -9) 📝 `docker/armv6/Dockerfile.buildx.alpine` (+0 -9) 📝 `docker/armv7/Dockerfile` (+0 -9) 📝 `docker/armv7/Dockerfile.alpine` (+0 -9) 📝 `docker/armv7/Dockerfile.buildx` (+0 -9) 📝 `docker/armv7/Dockerfile.buildx.alpine` (+0 -9) 📝 `src/main.rs` (+43 -5) </details> ### 📄 Description The previous persistent folder check worked by checking if a file exists. If you used a bind-mount, then this file is not there. But when using a docker/podman volume those files are copied, and caused the container to not start. This change checks the `/proc/self/mountinfo` for a specific patern to see if the data folder is persistent or not. Fixes #2622 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-07 08:00:17 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/vaultwarden#2987