[PR #658] [MERGED] Changed resolv.conf handling format to make it compatible with alpine linux #656

Closed
opened 2026-02-26 04:35:55 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/mageddo/dns-proxy-server/pull/658
Author: @mageddo
Created: 12/17/2025
Status: Merged
Merged: 12/17/2025
Merged by: @mageddo

Base: masterHead: feat/594


📝 Commits (10+)

📊 Changes

14 files changed (+710 additions, -15 deletions)

View changed files

📝 RELEASE-NOTES.md (+4 -1)
📝 gradle.properties (+1 -1)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefault.java (+1 -1)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinux.java (+2 -2)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetector.java (+1 -0)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigurator.java (+4 -0)
src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorV2.java (+422 -0)
📝 src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvedConfigurator.java (+2 -2)
📝 src/main/java/com/mageddo/dnsproxyserver/solver/remote/mapper/ResolverMapper.java (+1 -1)
📝 src/main/java/com/mageddo/net/IpAddr.java (+2 -2)
📝 src/main/java/com/mageddo/net/NetExecutorWatchdog.java (+1 -1)
📝 src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefaultTest.java (+1 -1)
📝 src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java (+4 -3)
src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorV2Test.java (+264 -0)

📄 Description

See #627


🔄 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/mageddo/dns-proxy-server/pull/658 **Author:** [@mageddo](https://github.com/mageddo) **Created:** 12/17/2025 **Status:** ✅ Merged **Merged:** 12/17/2025 **Merged by:** [@mageddo](https://github.com/mageddo) **Base:** `master` ← **Head:** `feat/594` --- ### 📝 Commits (10+) - [`779a2be`](https://github.com/mageddo/dns-proxy-server/commit/779a2be3f7596516532df21725ab65fe492c4ae6) Adjusts - [`552cc25`](https://github.com/mageddo/dns-proxy-server/commit/552cc254bb77760c7f28a9960e3ee23634fcd3a3) adjusts - [`276b6d1`](https://github.com/mageddo/dns-proxy-server/commit/276b6d16283d96e1e44aa65fca9ce9356fe427c3) adjusts - [`4ab882d`](https://github.com/mageddo/dns-proxy-server/commit/4ab882d86d3f5ee7c91f60041ded432b624e1e3a) adjusts - [`a79f32f`](https://github.com/mageddo/dns-proxy-server/commit/a79f32fe4c9597007da39c2adf4ba6f20fa872b7) adjusts - [`dfaf4ec`](https://github.com/mageddo/dns-proxy-server/commit/dfaf4ecd8e63ab56c9c19eca7920d9bfa2d9b329) adjusts - [`df9c703`](https://github.com/mageddo/dns-proxy-server/commit/df9c703ff6f2b14724bacfb42cf610893f7b6bab) adjusts - [`05d78eb`](https://github.com/mageddo/dns-proxy-server/commit/05d78eb8d7161c6fa75109566dde29e8ec4a32c0) adjusts - [`658cab8`](https://github.com/mageddo/dns-proxy-server/commit/658cab83933cae3fae571a927a3cf3fc84105086) adjusts - [`ca9d75a`](https://github.com/mageddo/dns-proxy-server/commit/ca9d75ad44166c4b747f76fe1e72a06011606526) adjusts ### 📊 Changes **14 files changed** (+710 additions, -15 deletions) <details> <summary>View changed files</summary> 📝 `RELEASE-NOTES.md` (+4 -1) 📝 `gradle.properties` (+1 -1) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefault.java` (+1 -1) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinux.java` (+2 -2) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetector.java` (+1 -0) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigurator.java` (+4 -0) ➕ `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorV2.java` (+422 -0) 📝 `src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvedConfigurator.java` (+2 -2) 📝 `src/main/java/com/mageddo/dnsproxyserver/solver/remote/mapper/ResolverMapper.java` (+1 -1) 📝 `src/main/java/com/mageddo/net/IpAddr.java` (+2 -2) 📝 `src/main/java/com/mageddo/net/NetExecutorWatchdog.java` (+1 -1) 📝 `src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefaultTest.java` (+1 -1) 📝 `src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java` (+4 -3) ➕ `src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorV2Test.java` (+264 -0) </details> ### 📄 Description See #627 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-02-26 04:35:55 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/dns-proxy-server-mageddo#656
No description provided.