Make docker-nobasepackages expand flag the default

It makes no sense to provide extra packages in the repository
provided to docker that are never used.

Author: mlschroe

Build.pm

@@ -739,10 +739,11 @@ sub get_build {
   } else {
     push @deps, @{$config->{'substitute'}->{"build-packages:$buildtype"} || $subst_defaults{"build-packages:$buildtype"} || []};
   }
-  if ($buildtype eq 'docker' || $buildtype eq 'kiwi') {
-    $nobasepackages = 1 if $config->{"expandflags:$buildtype-nobasepackages"};
-    @deps = grep {!/^kiwi-image:/} @deps if $buildtype eq 'kiwi';	# only needed for sysdeps
-    @deps = grep {!/^kiwi-packagemanager:/} @deps if $buildtype eq 'kiwi' && $nobasepackages;	# only needed for sysdeps
+  $nobasepackages = 1 if $buildtype eq 'docker';
+  if ($buildtype eq 'kiwi') {
+    $nobasepackages = 1 if $config->{"expandflags:kiwi-nobasepackages"};
+    @deps = grep {!/^kiwi-image:/} @deps;	# only needed for sysdeps
+    @deps = grep {!/^kiwi-packagemanager:/} @deps if $nobasepackages;	# only needed for sysdeps
   }
   my @ndeps = grep {/^-/} @deps;
   my %ndeps = map {$_ => 1} @ndeps;

docs/build_config.adoc

@@ -201,11 +201,6 @@ default, no module is used, so every module needed needs to be
 specified in the configuration. To remove a module, add an exclamation mark
 (!) as prefix.
 
-* docker-nobasepackages
-
-Do not put the require/support/preinstall packages in the repositories
-offered to the container build tool. This should have been the default.
-
 * kiwi-nobasepackages
 
 Do not put the require/support/preinstall packages in the repositories

docs/pbuild.html

@@ -1338,15 +1338,6 @@ <h4 id="_expandflags_flag_value">3.2.9. ExpandFlags: FLAG[:VALUE]</h4>
 <div class="ulist"><ul>
 <li>
 <p>
-docker-nobasepackages
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Do not put the require/support/preinstall packages in the repositories
-offered to the container build tool. This should have been the default.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
 kiwi-nobasepackages
 </p>
 </li>