Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit aa28ce0

Browse files
authored
Merge pull request #396 from thaJeztah/19.03_backport_update_moved_repositories
[19.03 backport] Update links/references to transferred repositories Upstream-commit: 5787ef7e9ce5951582ec51111b253184ef1cb2f3 Component: engine
2 parents 7bcce38 + 9afaee9 commit aa28ce0

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

components/engine/Dockerfile.windows

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
# The docker integration tests do not currently run in a container on Windows, predominantly
148148
# due to Windows not supporting privileged mode, so anything using a volume would fail.
149149
# They (along with the rest of the docker CI suite) can be run using
150-
# https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1.
150+
# https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1.
151151
#
152152
# -----------------------------------------------------------------------------------------
153153

@@ -218,13 +218,13 @@ RUN `
218218
Download-File "https://golang.org/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; `
219219
`
220220
Write-Host INFO: Downloading compiler 1 of 3...; `
221-
Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `
221+
Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `
222222
`
223223
Write-Host INFO: Downloading compiler 2 of 3...; `
224-
Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/runtime.zip C:\runtime.zip; `
224+
Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/runtime.zip C:\runtime.zip; `
225225
`
226226
Write-Host INFO: Downloading compiler 3 of 3...; `
227-
Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/binutils.zip C:\binutils.zip; `
227+
Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/binutils.zip C:\binutils.zip; `
228228
`
229229
Write-Host INFO: Extracting git...; `
230230
Expand-Archive C:\gitsetup.zip C:\git-tmp; `

components/engine/Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ pipeline {
786786
powershell '''
787787
$ErrorActionPreference = 'Stop'
788788
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
789-
Invoke-WebRequest https://github.com/jhowardmsft/docker-ci-zap/blob/master/docker-ci-zap.exe?raw=true -OutFile C:/Windows/System32/docker-ci-zap.exe
789+
Invoke-WebRequest https://github.com/moby/docker-ci-zap/blob/master/docker-ci-zap.exe?raw=true -OutFile C:/Windows/System32/docker-ci-zap.exe
790790
./hack/ci/windows.ps1
791791
exit $LastExitCode
792792
'''
@@ -846,7 +846,7 @@ pipeline {
846846
steps {
847847
powershell '''
848848
$ErrorActionPreference = 'Stop'
849-
Invoke-WebRequest https://github.com/jhowardmsft/docker-ci-zap/blob/master/docker-ci-zap.exe?raw=true -OutFile C:/Windows/System32/docker-ci-zap.exe
849+
Invoke-WebRequest https://github.com/moby/docker-ci-zap/blob/master/docker-ci-zap.exe?raw=true -OutFile C:/Windows/System32/docker-ci-zap.exe
850850
./hack/ci/windows.ps1
851851
exit $LastExitCode
852852
'''

components/engine/docs/contributing/software-req-win.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ quit due to the use of console hooks which are not available.
169169
The docker integration tests do not currently run in a container on Windows,
170170
predominantly due to Windows not supporting privileged mode, so anything using a volume would fail.
171171
They (along with the rest of the docker CI suite) can be run using
172-
https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1.
172+
https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1.
173173

174174
## Where to go next
175175

components/engine/hack/ci/windows.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# WARNING WARNING WARNING - DO NOT EDIT THIS FILE IN JENKINS DIRECTLY.
2-
# SUBMIT A PR TO https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/executeCI.ps1,
3-
# AND MAKE SURE https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1
4-
# ISN'T BROKEN!!!!!!! VALIDATE USING A TEST CONTEXT IN JENKINS. THEN COPY/PASTE INTO JENKINS PRODUCTION.
1+
# WARNING: When editing this file, consider submitting a PR to
2+
# https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/executeCI.ps1, and make sure that
3+
# https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1 isn't broken.
4+
# Validate using a test context in Jenkins, then copy/paste into Jenkins production.
55
#
66
# Jenkins CI scripts for Windows to Windows CI (Powershell Version)
77
# By John Howard (@jhowardmsft) January 2016 - bash version; July 2016 Ported to PowerShell
@@ -110,7 +110,7 @@ Write-Host -ForegroundColor Red "-----------------------------------------------
110110
# Jenkins Integration. Add a Windows Powershell build step as follows:
111111
#
112112
# Write-Host -ForegroundColor green "INFO: Jenkins build step starting"
113-
# $CISCRIPT_DEFAULT_LOCATION = "https://raw.githubusercontent.com/jhowardmsft/docker-w2wCIScripts/master/runCI/executeCI.ps1"
113+
# $CISCRIPT_DEFAULT_LOCATION = "https://raw.githubusercontent.com/moby/moby/master/hack/ci/windows.ps1"
114114
# $CISCRIPT_LOCAL_LOCATION = "$env:TEMP\executeCI.ps1"
115115
# Write-Host -ForegroundColor green "INFO: Removing cached execution script"
116116
# Remove-Item $CISCRIPT_LOCAL_LOCATION -Force -ErrorAction SilentlyContinue 2>&1 | Out-Null
@@ -800,7 +800,7 @@ Try {
800800
#if ($bbCount -eq 0) {
801801
Write-Host -ForegroundColor Green "INFO: Building busybox"
802802
$ErrorActionPreference = "SilentlyContinue"
803-
$(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" build -t busybox https://raw.githubusercontent.com/jhowardmsft/busybox/v1.1/Dockerfile | Out-Host)
803+
$(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" build -t busybox https://raw.githubusercontent.com/moby/busybox/v1.1/Dockerfile | Out-Host)
804804
$ErrorActionPreference = "Stop"
805805
if (-not($LastExitCode -eq 0)) {
806806
Throw "ERROR: Failed to build busybox image"
@@ -907,7 +907,7 @@ Try {
907907
$wc = New-Object net.webclient
908908
try {
909909
Write-Host -ForegroundColor green "INFO: Downloading latest execution script..."
910-
$wc.Downloadfile("https://raw.githubusercontent.com/jhowardmsft/docker-w2wCIScripts/master/runCI/lcowbasicvalidation.ps1", "$env:TEMP\binary\lcowbasicvalidation.ps1")
910+
$wc.Downloadfile("https://raw.githubusercontent.com/kevpar/docker-w2wCIScripts/master/runCI/lcowbasicvalidation.ps1", "$env:TEMP\binary\lcowbasicvalidation.ps1")
911911
}
912912
catch [System.Net.WebException]
913913
{

0 commit comments

Comments
 (0)