Merge branch 'master' into 1383-client-id

CHANGELOG.md

@@ -39,6 +39,8 @@ and this project adheres to
 ### Changed
 
 - `workDir` now supports symlinks.
+- 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`.
@@ -52,15 +54,16 @@ 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
 [#2358]: https://github.com/AdguardTeam/AdGuardHome/issues/2358
 [#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
 

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"]