From abf8f65f05ae51119909a90380fce5b18d3ec663 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Mon, 25 Jan 2021 18:07:49 +0300 Subject: [PATCH] Pull request: Remove Docker VOLUME instruction for more flexibility Merge in DNS/adguard-home from 2589-docker-volumes to master Squashed commit of the following: commit 5bff6ffa3138e9c09b786e4ff26fe286daa78c05 Merge: f0e9a74c e71019a1 Author: Ainar Garipov Date: Mon Jan 25 14:45:15 2021 +0300 Merge branch 'master' into 2589-docker-volumes commit f0e9a74cc3d8baecaac68730b684e65ec3178886 Author: Ainar Garipov Date: Mon Jan 25 14:44:07 2021 +0300 all: doc changes commit 76e538ca5f086fa99328dc10a05e7ca581457192 Author: Alex Povel Date: Thu Jan 21 15:07:11 2021 +0100 Remove Docker VOLUME instruction for more flexibility Inheriting from the base image is made easier without the VOLUME instruction, since it cannot be reverted. All guides contain `--volume` explanations/usage examples anyway, so the VOLUME instructions in the Dockerfile aren't necessary. See also https://stackoverflow.com/a/62068396/11477374 for more examples for why that instruction can be harmful. --- CHANGELOG.md | 5 ++++- scripts/make/Dockerfile | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b0d565a08f..fb8cb3d14a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,8 @@ and this project adheres to ### Changed +- Stopped mounting together the directories `/opt/adguardhome/conf` and + `/opt/adguardhome/work` in our Docker images ([#2589]). - When `dns.bogus_nxdomain` option is used, the server will now transform responses if there is at least one bogus address instead of all of them ([#2394]). The new behavior is the same as in `dnsmasq`. @@ -48,8 +50,8 @@ and this project adheres to [#2509]). [#2231]: https://github.com/AdguardTeam/AdGuardHome/issues/2231 -[#2276]: https://github.com/AdguardTeam/AdGuardHome/issues/2276 [#2271]: https://github.com/AdguardTeam/AdGuardHome/issues/2271 +[#2276]: https://github.com/AdguardTeam/AdGuardHome/issues/2276 [#2297]: https://github.com/AdguardTeam/AdGuardHome/issues/2297 [#2306]: https://github.com/AdguardTeam/AdGuardHome/issues/2306 [#2343]: https://github.com/AdguardTeam/AdGuardHome/issues/2343 @@ -57,6 +59,7 @@ and this project adheres to [#2391]: https://github.com/AdguardTeam/AdGuardHome/issues/2391 [#2394]: https://github.com/AdguardTeam/AdGuardHome/issues/2394 [#2509]: https://github.com/AdguardTeam/AdGuardHome/issues/2509 +[#2589]: https://github.com/AdguardTeam/AdGuardHome/issues/2589 ### Deprecated diff --git a/scripts/make/Dockerfile b/scripts/make/Dockerfile index f019345fcc7..ce10b621fa0 100644 --- a/scripts/make/Dockerfile +++ b/scripts/make/Dockerfile @@ -45,8 +45,6 @@ RUN setcap 'cap_net_bind_service=+eip' /opt/adguardhome/AdGuardHome EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 784/udp\ 853/tcp 3000/tcp 3001/tcp 5443/tcp 5443/udp -VOLUME ["/opt/adguardhome/conf", "/opt/adguardhome/work"] - WORKDIR /opt/adguardhome/work ENTRYPOINT ["/opt/adguardhome/AdGuardHome"]