Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403672 )
Change subject: Rebuild ci-src-setup with composer from our Docker registry
......................................................................
Rebuild ci-src-setup with composer from our Docker registry
Update:
mediawiki-core-php70-phan-docker
mwext-php70-phan-docker
Change-Id: I835080589fa4b66a22bf5dba7e6ba485e0b616a5
---
M dockerfiles/ci-src-setup/Dockerfile.template
M dockerfiles/ci-src-setup/changelog
M dockerfiles/ci-src-setup/control
M jjb/macro-docker.yaml
M jjb/mediawiki.yaml
5 files changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/72/403672/1
diff --git a/dockerfiles/ci-src-setup/Dockerfile.template
b/dockerfiles/ci-src-setup/Dockerfile.template
index b1d685e..14cb92a 100644
--- a/dockerfiles/ci-src-setup/Dockerfile.template
+++ b/dockerfiles/ci-src-setup/Dockerfile.template
@@ -3,7 +3,7 @@
RUN git clone --depth 1
https://gerrit.wikimedia.org/r/p/integration/jenkins.git /srv/jenkins && \
rm -rf /srv/jenkins/.git
-FROM wmfreleng/composer:latest as composer
+FROM {{ "composer" | image_tag }} as composer
FROM {{ "ci-jessie" | image_tag }}
diff --git a/dockerfiles/ci-src-setup/changelog
b/dockerfiles/ci-src-setup/changelog
index 497fa78..07fab67 100644
--- a/dockerfiles/ci-src-setup/changelog
+++ b/dockerfiles/ci-src-setup/changelog
@@ -1,3 +1,10 @@
+ci-src-setup (0.2.0) wikimedia; urgency=medium
+
+ * Rebuild with docker-registry.wikimedia.org/releng/composer
+ * Add composer to Depends
+
+ -- Antoine Musso <[email protected]> Thu, 11 Jan 2018 16:03:14 +0100
+
ci-src-setup (0.1.1) wikimedia; urgency=medium
* Add php7.0-curl - T183322
diff --git a/dockerfiles/ci-src-setup/control b/dockerfiles/ci-src-setup/control
index 8c6d9e3..c5dfcf3 100644
--- a/dockerfiles/ci-src-setup/control
+++ b/dockerfiles/ci-src-setup/control
@@ -1 +1 @@
-Depends: ci-jessie
+Depends: ci-jessie, composer
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index 8f12afe..0fc3768 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -109,7 +109,7 @@
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
--entrypoint "bash" \
- docker-registry.wikimedia.org/releng/ci-src-setup:0.1.1 \
+ docker-registry.wikimedia.org/releng/ci-src-setup:0.2.0 \
/srv/setup-mwext.sh
# nothing else can be executed due to exec
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 50a6ed5..3141446 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -436,7 +436,7 @@
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
--entrypoint "bash" \
- docker-registry.wikimedia.org/releng/ci-src-setup:0.1.1 \
+ docker-registry.wikimedia.org/releng/ci-src-setup:0.2.0 \
/srv/setup-mw.sh
# nothing else can be executed due to exec
- shell: |
--
To view, visit https://gerrit.wikimedia.org/r/403672
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I835080589fa4b66a22bf5dba7e6ba485e0b616a5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
