Commit b0e8cc5
committed
PRODENG-3471: fix Windows MCR install for FIPS channels
For FIPS channels (e.g. stable-29.2.1/fips) the Windows MCR installer
repo publishes versioned artifacts (docker-29.2.1+fips.zip) but does
NOT publish docker-latest+fips.zip. Launchpad was hardcoding
DOCKER_VERSION=latest, which caused the installer to construct a
non-existent URL and exit 1 on all Windows nodes.
Linux nodes were unaffected because the Linux installers use
package-manager channels, not this download URL.
Fix: add MCRConfig.WindowsInstallerVersion() which returns 'latest'
for all non-FIPS channels (preserving current behaviour — only
docker-latest.zip is published for non-FIPS) and extracts the version
from the channel string for FIPS channels:
stable-29.2.1/fips → 29.2.1
stable-29.4.1/fips → 29.4.1
test-29.4.1-rc3/fips → 29.4.1-rc3
The installer script appends +fips automatically when CHANNEL contains
/fips, so only the numeric version needs to be supplied.
Note: the ticket's proposed Version() method extracted the version for
all versioned channels (e.g. stable-29.2 → 29.2), which would break
non-FIPS installs since docker-29.2.zip is not published.
WindowsInstallerVersion() guards on the /fips suffix to avoid this.
Signed-off-by: James Nesbitt <jnesbitt@mirantis.com>1 parent c691642 commit b0e8cc5
3 files changed
Lines changed: 62 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
| 63 | + | |
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
| 5 | + | |
4 | 6 | | |
5 | 7 | | |
6 | 8 | | |
| |||
70 | 72 | | |
71 | 73 | | |
72 | 74 | | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
0 commit comments