jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399366 )
Change subject: docker: point Castor FROM to the public registry
......................................................................
docker: point Castor FROM to the public registry
Bug: T183342
Change-Id: Id2a1eb4afba2e6267a08646557bfd301d654e43f
---
M dockerfiles/castor/Dockerfile.template
M dockerfiles/castor/changelog
M jjb/castor-save-workspacecache.bash
M jjb/castor.yaml
4 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dockerfiles/castor/Dockerfile.template
b/dockerfiles/castor/Dockerfile.template
index b2ceb26..1b0c2ac 100644
--- a/dockerfiles/castor/Dockerfile.template
+++ b/dockerfiles/castor/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM {{ registry }}/wikimedia-stretch
+FROM docker-registry.wikimedia.org/wikimedia-stretch
RUN {{ "rsync" | apt_install }} \
&& mkdir -p /castor
diff --git a/dockerfiles/castor/changelog b/dockerfiles/castor/changelog
index 3093126..ff818d4 100644
--- a/dockerfiles/castor/changelog
+++ b/dockerfiles/castor/changelog
@@ -1,3 +1,10 @@
+castor (0.1.2) wikimedia; urgency=medium
+
+ * Always point FROM to docker-registry.wikimedia.org, since we can not pull
+ from the private endpoint docker-registry.discovery.wmnet T183342
+
+ -- Antoine Musso <[email protected]> Wed, 20 Dec 2017 10:51:16 +0100
+
castor (0.1.1) wikimedia; urgency=medium
* Python 3.4.2 shutil.copytree() is unable to copy a symbolic link pointing
diff --git a/jjb/castor-save-workspacecache.bash
b/jjb/castor-save-workspacecache.bash
index 2a089b0..bb11f12 100644
--- a/jjb/castor-save-workspacecache.bash
+++ b/jjb/castor-save-workspacecache.bash
@@ -20,7 +20,7 @@
--archive \
--compress \
--rsh="/usr/bin/ssh -a -T -o ConnectTimeout=6 -o
UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" \
- --rsync-path="docker run --rm -i --volume ${remote_cache_dir}:${cache_dir}
--entrypoint=/usr/bin/rsync docker-registry.wikimedia.org/releng/castor:0.1.1" \
+ --rsync-path="docker run --rm -i --volume ${remote_cache_dir}:${cache_dir}
--entrypoint=/usr/bin/rsync docker-registry.wikimedia.org/releng/castor:0.1.2" \
--delete-delay \
jenkins-deploy@"${REMOTE_INSTANCE}:${cache_dir}/" "${DEST}"
diff --git a/jjb/castor.yaml b/jjb/castor.yaml
index 9019f6e..0fafbe2 100644
--- a/jjb/castor.yaml
+++ b/jjb/castor.yaml
@@ -66,7 +66,7 @@
exec docker run --rm \
--env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
--volume "$(pwd)"/cache:/cache \
- 'docker-registry.wikimedia.org/releng/castor:0.1.1'
clear || :
+ 'docker-registry.wikimedia.org/releng/castor:0.1.2'
clear || :
# nothing else can be executed due to exec
# Entry point to load cache from central cache
@@ -92,7 +92,7 @@
exec docker run --rm \
--env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
--volume "${WORKSPACE}/cache":/cache \
- docker-registry.wikimedia.org/releng/castor:0.1.1 \
+ docker-registry.wikimedia.org/releng/castor:0.1.2 \
load
# nothing else can be executed due to exec
--
To view, visit https://gerrit.wikimedia.org/r/399366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2a1eb4afba2e6267a08646557bfd301d654e43f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
