all: remove old Dockerfile, improve build scripts

.dockerignore

@@ -1,2 +1,3 @@
 # Ignore everything except for explicitly allowed stuff.
 *
+!dist/docker

.github/workflows/build.yml

@@ -62,7 +62,7 @@
       'with':
         'token': '${{ secrets.CODECOV_TOKEN }}'
         'file': './coverage.txt'
-  'app':
+  'build-release':
     'runs-on': 'ubuntu-latest'
     'needs': 'test'
     'steps':
@@ -96,16 +96,7 @@
     - 'name': 'Set up Snapcraft'
       'run': 'sudo apt-get -yq --no-install-suggests --no-install-recommends install snapcraft'
     - 'name': 'Run snapshot build'
-      'run': 'make SIGN=0 VERBOSE=2 js-deps js-build build-release'
-
-  'docker':
-    'runs-on': 'ubuntu-latest'
-    'needs': 'test'
-    'steps':
-    - 'name': 'Checkout'
-      'uses': 'actions/checkout@v2'
-      'with':
-        'fetch-depth': 0
+      'run': 'make SIGN=0 VERBOSE=1 js-deps js-build build-release'
     - 'name': 'Set up QEMU'
       'uses': 'docker/setup-qemu-action@v1'
     - 'name': 'Set up Docker Buildx'

CHANGELOG.md

@@ -10,7 +10,7 @@ and this project adheres to
 ## [Unreleased]
 
 <!--
-## [v0.105.0] - 2020-12-28
+## [v0.105.0] - 2021-01-18
 -->
 
 ### Added
@@ -44,11 +44,11 @@ and this project adheres to
   improve error response ([#2358]).
 - Improved HTTP requests handling and timeouts ([#2343]).
 - Our snap package now uses the `core20` image as its base ([#2306]).
-- New build system and various internal improvements ([#2267], [#2271],
+- New build system and various internal improvements ([#2276], [#2271],
   [#2297]).
 
 [#2231]: https://github.com/AdguardTeam/AdGuardHome/issues/2231
-[#2267]: https://github.com/AdguardTeam/AdGuardHome/issues/2267
+[#2276]: https://github.com/AdguardTeam/AdGuardHome/issues/2276
 [#2271]: https://github.com/AdguardTeam/AdGuardHome/issues/2271
 [#2297]: https://github.com/AdguardTeam/AdGuardHome/issues/2297
 [#2306]: https://github.com/AdguardTeam/AdGuardHome/issues/2306
@@ -82,6 +82,8 @@ and this project adheres to
 
 ### Removed
 
+- `Dockerfile` ([#2276]).  Replaced with the script
+  `scripts/make/build-docker.sh` which uses `scripts/make/Dockerfile`.
 - Support for pre-v0.99.3 format of query logs ([#2102]).
 
 ## [v0.104.3] - 2020-11-19

scripts/make/clean.sh

@@ -25,7 +25,9 @@ rm -f\
 rm -f -r\
 	./bin/\
 	./build/\
+	./build2/\
 	./client/node_modules/\
+	./client2/node_modules/\
 	./data/\
 	"./${dist_dir}/"\
 	;