Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404141 )
Change subject: WIPDNM phan 0.9
......................................................................
WIPDNM phan 0.9
Change-Id: I2eaad72b483b8224c4c327e99febed07f9548352
---
A dockerfiles/composer-71/Dockerfile.template
A dockerfiles/composer-71/changelog
A dockerfiles/composer-71/control
A dockerfiles/mediawiki-phan-0.9/Dockerfile.template
A dockerfiles/mediawiki-phan-0.9/README.md
A dockerfiles/mediawiki-phan-0.9/changelog
A dockerfiles/mediawiki-phan-0.9/control
A dockerfiles/mediawiki-phan-0.9/run.sh
A dockerfiles/php71/Dockerfile.template
A dockerfiles/php71/apt.gpg
A dockerfiles/php71/changelog
A dockerfiles/php71/control
12 files changed, 121 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/41/404141/1
diff --git a/dockerfiles/composer-71/Dockerfile.template
b/dockerfiles/composer-71/Dockerfile.template
new file mode 100644
index 0000000..f28e233
--- /dev/null
+++ b/dockerfiles/composer-71/Dockerfile.template
@@ -0,0 +1,16 @@
+FROM {{ "php71" | image_tag }}
+
+USER root
+
+RUN git clone --depth 1
https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer \
+ && rm -rf /srv/composer/.git \
+ && ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
+
+USER nobody
+
+# If a later dockerfile enables xdebug, don't
+# spam warnings about it.
+ENV COMPOSER_DISABLE_XDEBUG_WARN=1
+
+ENTRYPOINT ["/srv/composer/vendor/bin/composer"]
+CMD ["help"]
diff --git a/dockerfiles/composer-71/changelog
b/dockerfiles/composer-71/changelog
new file mode 100644
index 0000000..ba5e2bc
--- /dev/null
+++ b/dockerfiles/composer-71/changelog
@@ -0,0 +1,5 @@
+composer-71 (0.1.0) wikimedia; urgency=medium
+
+ * Initial version running composer on php 7.1
+
+ -- Addshore <[email protected]> Thu, 13 Jan 2018 22:28:00 +0000
diff --git a/dockerfiles/composer-71/control b/dockerfiles/composer-71/control
new file mode 100644
index 0000000..73aa75a
--- /dev/null
+++ b/dockerfiles/composer-71/control
@@ -0,0 +1 @@
+Depends: php71
diff --git a/dockerfiles/mediawiki-phan-0.9/Dockerfile.template
b/dockerfiles/mediawiki-phan-0.9/Dockerfile.template
new file mode 100644
index 0000000..5189f48
--- /dev/null
+++ b/dockerfiles/mediawiki-phan-0.9/Dockerfile.template
@@ -0,0 +1,27 @@
+FROM {{ "composer-71" | image_tag }}
+
+USER root
+
+RUN install -d /srv/phan -o nobody
+
+# Install php7.0 dev for phpize, and php-pear for pecl
+# pecl allows us to install the newer versions of ast
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get install --yes
--no-install-recommends \
+ php7.0-dev php-pear make && \
+ pecl install ast && \
+ apt-get remove --yes \
+ php7.0-dev php-pear make && \
+ apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/*
&& \
+ mv /usr/lib/php/20151012/ast.so
+
+ENV PHAN /srv/phan/vendor/bin/phan
+
+USER nobody
+
+RUN cd /srv/phan && \
+ composer require phan/phan:0.9.7 && \
+ rm -rf /cache/*
+
+COPY run.sh /run.sh
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/mediawiki-phan-0.9/README.md
b/dockerfiles/mediawiki-phan-0.9/README.md
new file mode 100644
index 0000000..b2a5430
--- /dev/null
+++ b/dockerfiles/mediawiki-phan-0.9/README.md
@@ -0,0 +1,17 @@
+##Volumes
+
+**/mediawiki**
+
+This should be a copy of mediawiki.
+
+
+## Example
+
+To run phan for the ElectronPdfService extension:
+
+```
+docker run --rm \
+ -v /dev/git/gerrit/mediawiki:/mediawiki \
+ docker-registry.wikimedia.org/releng/mediawiki-phan:latest \
+ /mediawiki/extensions/ElectronPdfService -m checkstyle
+```
diff --git a/dockerfiles/mediawiki-phan-0.9/changelog
b/dockerfiles/mediawiki-phan-0.9/changelog
new file mode 100644
index 0000000..fad0746
--- /dev/null
+++ b/dockerfiles/mediawiki-phan-0.9/changelog
@@ -0,0 +1,5 @@
+mediawiki-phan-0.9 (0.1.0) wikimedia; urgency=medium
+
+ * Initial phan 0.9.7 version
+
+ -- Addshore <[email protected]> Fri, 13 Jan 2018 22:27:00 +0000
diff --git a/dockerfiles/mediawiki-phan-0.9/control
b/dockerfiles/mediawiki-phan-0.9/control
new file mode 100644
index 0000000..a687801
--- /dev/null
+++ b/dockerfiles/mediawiki-phan-0.9/control
@@ -0,0 +1 @@
+Depends: composer-71
diff --git a/dockerfiles/mediawiki-phan-0.9/run.sh
b/dockerfiles/mediawiki-phan-0.9/run.sh
new file mode 100644
index 0000000..12e98dc
--- /dev/null
+++ b/dockerfiles/mediawiki-phan-0.9/run.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+umask 002
+
+/mediawiki/tests/phan/bin/phan $@
diff --git a/dockerfiles/php71/Dockerfile.template
b/dockerfiles/php71/Dockerfile.template
new file mode 100644
index 0000000..ae5c95f
--- /dev/null
+++ b/dockerfiles/php71/Dockerfile.template
@@ -0,0 +1,36 @@
+FROM {{ "ci-stretch" | image_tag }}
+
+COPY apt.gpg /etc/apt/trusted.gpg.d/php.gpg
+
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get install --yes
--no-install-recommends \
+ # Required by sury per https://packages.sury.org/php/README.txt
+ apt-transport-https lsb-release ca-certificates && \
+ echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" >
/etc/apt/sources.list.d/php.list && \
+ # Only update the source we have added to save time
+ apt-get update -o Dir::Etc::sourcelist="sources.list.d/php.list" -o
Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" && \
+ DEBIAN_FRONTEND=noninteractive apt-get install --yes
--no-install-recommends \
+ php7.1-cli \
+ php7.1-zip \
+ php-ast \
+ php7.1-curl \
+ php7.1-dba \
+ php7.1-mbstring \
+ php-redis \
+ php7.1-sqlite3 \
+ php-xdebug \
+ php7.1-xml && \
+ apt-get remove --yes \
+ apt-transport-https lsb-release ca-certificates && \
+ apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/*
&& \
+ rm /etc/apt/sources.list.d/php.list
+
+RUN {{ packages | apt_install }}
+
+# Disable xdebug by default due to its performance impact
+RUN phpdismod xdebug
+
+USER nobody
+
+ENTRYPOINT ["php"]
+CMD ["--help"]
diff --git a/dockerfiles/php71/apt.gpg b/dockerfiles/php71/apt.gpg
new file mode 100644
index 0000000..dc4d282
--- /dev/null
+++ b/dockerfiles/php71/apt.gpg
Binary files differ
diff --git a/dockerfiles/php71/changelog b/dockerfiles/php71/changelog
new file mode 100644
index 0000000..da9c36d
--- /dev/null
+++ b/dockerfiles/php71/changelog
@@ -0,0 +1,5 @@
+php71 (0.1.0) wikimedia; urgency=medium
+
+ * Initial php 7.1 image
+
+ -- Addshore <[email protected]> Fri, 13 Jan 2018 21:21:29 +0000
diff --git a/dockerfiles/php71/control b/dockerfiles/php71/control
new file mode 100644
index 0000000..6ffa818
--- /dev/null
+++ b/dockerfiles/php71/control
@@ -0,0 +1 @@
+Depends: ci-stretch
--
To view, visit https://gerrit.wikimedia.org/r/404141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2eaad72b483b8224c4c327e99febed07f9548352
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
