Skip to content

Commit

Permalink
Merge pull request #1331 from lmm/automated-cherry-pick-of-#1330-upst…
Browse files Browse the repository at this point in the history
…ream-release-v3.21

Automated cherry pick of #1330: windows: fix entrypoint not deleting the outer zip file
  • Loading branch information
caseydavenport authored Nov 5, 2021
2 parents 4edb0d4 + 8eb7bd5 commit 92877ad
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions windows-upgrade/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@ USER ContainerAdministrator

ENTRYPOINT cmd.exe \
/C \
copy /y c:\\CalicoBin\\calico-windows-upgrade.zip c:\\CalicoUpgrade & \
tar -x -f c:\\CalicoUpgrade\calico-windows-upgrade.zip -C c:\\CalicoUpgrade & \
del c:\\CalicoUpgrade\calico-windows-upgrade.zip & \
icacls.exe c:\\CalicoUpgrade & \
icacls.exe c:\\CalicoUpgrade /inheritance:r & \
icacls.exe c:\\CalicoUpgrade /grant:r SYSTEM:(OI)(CI)(F) & \
icacls.exe c:\\CalicoUpgrade /grant:r BUILTIN\Administrators:(OI)(CI)(F) & \
icacls.exe c:\\CalicoUpgrade /grant:r BUILTIN\Users:(OI)(CI)(RX) & \
icacls.exe c:\\CalicoUpgrade & \
copy /y c:\CalicoBin\calico-windows-upgrade.zip c:\CalicoUpgrade & \
tar -x -f c:\CalicoUpgrade\calico-windows-upgrade.zip -C c:\CalicoUpgrade & \
del c:\CalicoUpgrade\calico-windows-upgrade.zip & \
dir c:\CalicoUpgrade & \
icacls.exe c:\CalicoUpgrade & \
icacls.exe c:\CalicoUpgrade /inheritance:r & \
icacls.exe c:\CalicoUpgrade /grant:r SYSTEM:(OI)(CI)(F) & \
icacls.exe c:\CalicoUpgrade /grant:r BUILTIN\Administrators:(OI)(CI)(F) & \
icacls.exe c:\CalicoUpgrade /grant:r BUILTIN\Users:(OI)(CI)(RX) & \
icacls.exe c:\CalicoUpgrade & \
ping -t localhost > NUL

0 comments on commit 92877ad

Please sign in to comment.