Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403647 )
Change subject: Migrate composer-package to docker-pkg
......................................................................
Migrate composer-package to docker-pkg
Update:
composer-package-php70-docker
mwgate-composer-package-php70-docker
Bug: T177276
Change-Id: I5365eff94ab411c4cce30fab991d4a695772c58c
---
A dockerfiles/composer-package/.dockerignore
A dockerfiles/composer-package/.gitignore
R dockerfiles/composer-package/Dockerfile.template
A dockerfiles/composer-package/changelog
A dockerfiles/composer-package/control
M dockerfiles/composer-package/example-run.sh
M dockerfiles/composer-package/run.sh
M jjb/mediawiki.yaml
M jjb/php.yaml
9 files changed, 29 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/47/403647/1
diff --git a/dockerfiles/composer-package/.dockerignore
b/dockerfiles/composer-package/.dockerignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/composer-package/.dockerignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/composer-package/.gitignore
b/dockerfiles/composer-package/.gitignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/composer-package/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/composer-package/Dockerfile
b/dockerfiles/composer-package/Dockerfile.template
similarity index 64%
rename from dockerfiles/composer-package/Dockerfile
rename to dockerfiles/composer-package/Dockerfile.template
index a72a545..d1eb29b 100644
--- a/dockerfiles/composer-package/Dockerfile
+++ b/dockerfiles/composer-package/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/composer:latest
+FROM {{ "composer" | image_tag }}
USER root
# Enable xdebug for PHPUnit coverage reports
@@ -6,4 +6,4 @@
USER nobody
COPY run.sh /run.sh
-ENTRYPOINT /bin/bash /run.sh
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/composer-package/changelog
b/dockerfiles/composer-package/changelog
new file mode 100644
index 0000000..fe85dfc
--- /dev/null
+++ b/dockerfiles/composer-package/changelog
@@ -0,0 +1,7 @@
+composer-package (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+ * change ENTRYPOINT to exec form
+ * cleanup example-run.sh
+
+ -- Antoine Musso <[email protected]> Thu, 11 Jan 2018 14:22:11 +0100
diff --git a/dockerfiles/composer-package/control
b/dockerfiles/composer-package/control
new file mode 100644
index 0000000..c626649
--- /dev/null
+++ b/dockerfiles/composer-package/control
@@ -0,0 +1 @@
+Depends: composer
diff --git a/dockerfiles/composer-package/example-run.sh
b/dockerfiles/composer-package/example-run.sh
old mode 100644
new mode 100755
index 50b2ebf..0ee2aea
--- a/dockerfiles/composer-package/example-run.sh
+++ b/dockerfiles/composer-package/example-run.sh
@@ -1,18 +1,21 @@
#!/bin/bash
+set -eux -o pipefail
+
+mkdir -m 777 -p cache
mkdir -m 777 -p log
mkdir -m 777 -p src
+(
cd src
git init
-git fetch --quiet --depth 1 "https://gerrit.wikimedia.org/r/utfnormal";
"refs/changes/57/375857/1"
+git fetch --quiet --depth 1 "https://gerrit.wikimedia.org/r/utfnormal"; "master"
git checkout FETCH_HEAD
-cd ..
+)
mkdir -p log
docker run \
--rm --tty \
- --volume /$(pwd)/log://var/lib/jenkins/log \
- --volume /$(pwd)/src://src \
- wmfreleng/composer-package:latest
-rm -rf src
-rm -rf log
+ --volume "/$(pwd)/cache://cache" \
+ --volume "/$(pwd)/log://var/lib/jenkins/log" \
+ --volume "/$(pwd)/src://src" \
+ docker-registry.wikimedia.org/releng/composer-package:latest
diff --git a/dockerfiles/composer-package/run.sh
b/dockerfiles/composer-package/run.sh
old mode 100644
new mode 100755
index 161247c..0015c37
--- a/dockerfiles/composer-package/run.sh
+++ b/dockerfiles/composer-package/run.sh
@@ -8,4 +8,4 @@
composer --ansi validate
composer install --no-progress --prefer-dist
-composer test
+exec composer test
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index bcf53b5..9c5c2e2 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -267,7 +267,7 @@
- php55:
image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.1
- php70:
- image: wmfreleng/composer-package:v2017.10.28.07.05
+ image:
docker-registry.wikimedia.org/releng/composer-package:0.1.0
- '{name}-composer-{phpflavor}-docker':
phpflavor:
- hhvm:
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 7d8ebf4..b83d120 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -207,7 +207,7 @@
- php55:
image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.1
- php70:
- image: wmfreleng/composer-package:v2017.10.28.07.05
+ image:
docker-registry.wikimedia.org/releng/composer-package:0.1.0
- 'composer-{phpflavor}-docker':
phpflavor:
- hhvm:
--
To view, visit https://gerrit.wikimedia.org/r/403647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5365eff94ab411c4cce30fab991d4a695772c58c
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
