Add option to disable installation of docker-credential-wincred

slonopotamus · Jun 13, 2024 · d806445 · d806445
1 parent 20a3037
commit d806445
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -5,6 +5,10 @@
 This document provides a high-level view of the changes to the Stevedore by release.
 For a detailed view of what has changed, refer to the {uri-project}/commits/main[commit history] on GitHub.
 
+== Unreleased
+
+* Add option to disable installation of docker-credential-wincred
+
 == 1.5.2 (2024-05-28) - @slonopotamus
 
 * Update Docker Engine to 26.1.3

diff --git a/README.adoc b/README.adoc
@@ -72,6 +72,7 @@ If you only want to install specific Stevedore features, use `ADDLOCAL=Feature1,
 
 .List of available MSI features for `ADDLOCAL`
 * `FeatureHyperV` installs Hyper-V support.
+* `FeatureWincred` install docker-credential-wincred.
 It allows running containers with https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/hyperv-container#hyper-v-isolation[Hyper-V isolation].
 
 You can also pass custom installation properties to Stevedore installer using `PROPERTY=value` syntax.

diff --git a/wix/main.wxs b/wix/main.wxs
@@ -159,10 +159,12 @@
                     </Component>
 
                     <Directory Id='bin' Name='bin'>
-                        <Component Id='bin_Comp' Guid="e68f9ac8-53cc-378f-8c95-589bab7d0b21">
+                        <Component Id='bin_Comp' Guid='e68f9ac8-53cc-378f-8c95-589bab7d0b21'>
                             <File Source='target\$(var.Profile)\docker\docker.exe'/>
                             <File Source='target\$(var.Profile)\docker\docker-proxy.exe'/>
-                            <File Source='target\$(var.Profile)\docker-credential-wincred.exe'/>
+                            <Component Id='wincred_Comp' Guid='ba2e5ab3-320e-4187-8821-66ad87f61a33'>
+                                <File Source='target\$(var.Profile)\docker-credential-wincred.exe'/>
+                            </Component>
                             <File Id='docker_compose_v1.exe' Name="docker-compose.exe"
                                   Source='target\$(var.Profile)\docker-compose.exe'/>
                             <Environment Id="PATH"
@@ -215,6 +217,14 @@
                 <!-- Dummy component to get rid of the "run from network" option  -->
                 <ComponentRef Id='License'/>
             </Feature>
+
+            <Feature
+                    Id='FeatureWincred'
+                    Title='docker-credential-wincred'
+                    AllowAdvertise='no'
+                    Display='expand'>
+                <ComponentRef Id='wincred_Comp'/>
+            </Feature>
         </Feature>
 
         <Property Id='POWERSHELLEXE' Value='C:\Windows\sysnative\WindowsPowerShell\v1.0\powershell.exe'/>