Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/385996 )
Change subject: Convert ci-jessie to use docker-pkg
......................................................................
Convert ci-jessie to use docker-pkg
Change-Id: Ic1cd5571de6a0f6bca841794582dc865d988f3ca
---
D dockerfiles/ci-jessie/Dockerfile
A dockerfiles/ci-jessie/Dockerfile.template
A dockerfiles/ci-jessie/changelog
A dockerfiles/ci-jessie/control
D dockerfiles/ci-stretch/Dockerfile
A dockerfiles/ci-stretch/Dockerfile.template
A dockerfiles/ci-stretch/changelog
A dockerfiles/ci-stretch/control
R dockerfiles/composer-package/Dockerfile.template
A dockerfiles/composer-package/changelog
A dockerfiles/composer-package/control
R dockerfiles/composer-test/Dockerfile.template
A dockerfiles/composer-test/changelog
A dockerfiles/composer-test/control
R dockerfiles/composer/Dockerfile.template
A dockerfiles/composer/changelog
A dockerfiles/composer/control
D dockerfiles/composer/prebuild.sh
A dockerfiles/convert.sh
D dockerfiles/npm/Dockerfile
A dockerfiles/npm/Dockerfile.template
A dockerfiles/npm/changelog
D dockerfiles/operations-puppet/Dockerfile
A dockerfiles/operations-puppet/Dockerfile.template
M dockerfiles/operations-puppet/bundle-config
A dockerfiles/operations-puppet/changelog
A dockerfiles/operations-puppet/control
D dockerfiles/operations-puppet/prebuild.sh
M dockerfiles/operations-puppet/run.sh
D dockerfiles/php/Dockerfile
A dockerfiles/php/Dockerfile.template
A dockerfiles/php/changelog
A dockerfiles/php/control
D dockerfiles/tox/Dockerfile
A dockerfiles/tox/Dockerfile.template
A dockerfiles/tox/changelog
A dockerfiles/tox/control
37 files changed, 178 insertions(+), 199 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/96/385996/1
diff --git a/dockerfiles/ci-jessie/Dockerfile b/dockerfiles/ci-jessie/Dockerfile
deleted file mode 100644
index df45cd4..0000000
--- a/dockerfiles/ci-jessie/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM docker-registry.wikimedia.org/wikimedia-jessie:latest
-
-# Cache directory, honored by multiple softwares
-ENV XDG_CACHE_HOME=/cache
-
-RUN echo 'APT::Install-Recommends "false";' >
/etc/apt/apt.conf.d/99disable-install-recommends && \
- install --directory --mode 777 "${XDG_CACHE_HOME}" /log /src
-
-
-# Locale generation, auto generated by installing 'locales'
-RUN apt-get update && \
- echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
- DEBIAN_FRONTEND=noninteractive apt-get install --yes \
- ca-certificates \
- git \
- locales \
- && \
- rm -rf /var/lib/apt/lists/*
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
diff --git a/dockerfiles/ci-jessie/Dockerfile.template
b/dockerfiles/ci-jessie/Dockerfile.template
new file mode 100644
index 0000000..b1f30a6
--- /dev/null
+++ b/dockerfiles/ci-jessie/Dockerfile.template
@@ -0,0 +1,14 @@
+FROM {{ seed_image }}
+
+# Keep the following in sync with ci-stretch
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Cache directory, honored by multiple softwares
+ENV XDG_CACHE_HOME=/cache
+
+# Locale are auto generated by installing 'locales'
+RUN install --directory --mode 777 "${XDG_CACHE_HOME}" /log /src \
+ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
+ && {{ "ca-certificates git locales" | apt_install }}
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
diff --git a/dockerfiles/ci-jessie/changelog b/dockerfiles/ci-jessie/changelog
new file mode 100644
index 0000000..8189bad
--- /dev/null
+++ b/dockerfiles/ci-jessie/changelog
@@ -0,0 +1,5 @@
+ci-jessie (0.3.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Thu, 19 Oct 2017 10:09:28
+0200
diff --git a/dockerfiles/ci-jessie/control b/dockerfiles/ci-jessie/control
new file mode 100644
index 0000000..d119dc0
--- /dev/null
+++ b/dockerfiles/ci-jessie/control
@@ -0,0 +1,3 @@
+Package: ci-jessie
+Description: Base jessie image for CI tasksk
+Maintainer: Antoine Musso <[email protected]>
diff --git a/dockerfiles/ci-stretch/Dockerfile
b/dockerfiles/ci-stretch/Dockerfile
deleted file mode 100644
index ca41a75..0000000
--- a/dockerfiles/ci-stretch/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM docker-registry.wikimedia.org/wikimedia-stretch:latest
-
-# Cache directory, honored by multiple softwares
-ENV XDG_CACHE_HOME=/cache
-
-RUN echo 'APT::Install-Recommends "false";' >
/etc/apt/apt.conf.d/99disable-install-recommends && \
- install --directory --mode 777 "${XDG_CACHE_HOME}" /log /src
-
-# Locale generation, auto generated by installing 'locales'
-RUN apt-get update && \
- echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
- DEBIAN_FRONTEND=noninteractive apt-get install --yes \
- ca-certificates \
- git \
- locales \
- && \
- rm -rf /var/lib/apt/lists/*
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
diff --git a/dockerfiles/ci-stretch/Dockerfile.template
b/dockerfiles/ci-stretch/Dockerfile.template
new file mode 100644
index 0000000..c7f9d9e
--- /dev/null
+++ b/dockerfiles/ci-stretch/Dockerfile.template
@@ -0,0 +1,11 @@
+FROM docker-registry.wikimedia.org/wikimedia-stretch:latest
+
+# Cache directory, honored by multiple softwares
+ENV XDG_CACHE_HOME=/cache
+
+# Locale generation, auto generated by installing 'locales'
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
+ && {{ "ca-certificates git locales" | apt_install }} \
+ && install --directory --mode 777 "${XDG_CACHE_HOME}" /log /src
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
diff --git a/dockerfiles/ci-stretch/changelog b/dockerfiles/ci-stretch/changelog
new file mode 100644
index 0000000..571714c
--- /dev/null
+++ b/dockerfiles/ci-stretch/changelog
@@ -0,0 +1,5 @@
+ci-stretch (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Mon, 23 Oct 2017 16:08:10
+0200
diff --git a/dockerfiles/ci-stretch/control b/dockerfiles/ci-stretch/control
new file mode 100644
index 0000000..702b025
--- /dev/null
+++ b/dockerfiles/ci-stretch/control
@@ -0,0 +1,3 @@
+Package: ci-stretch
+Description: Base CI image based on Debian Stretch.
+Maintainer: Kunal Mehta <[email protected]>
diff --git a/dockerfiles/composer-package/Dockerfile
b/dockerfiles/composer-package/Dockerfile.template
similarity index 79%
rename from dockerfiles/composer-package/Dockerfile
rename to dockerfiles/composer-package/Dockerfile.template
index a72a545..6c4b26d 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
diff --git a/dockerfiles/composer-package/changelog
b/dockerfiles/composer-package/changelog
new file mode 100644
index 0000000..0d03d3a
--- /dev/null
+++ b/dockerfiles/composer-package/changelog
@@ -0,0 +1,5 @@
+composer-package (0.1.0) wikimedia; urgency=medium
+
+ * Initial port to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Thu, 19 Oct 2017 14:17:47
+0200
diff --git a/dockerfiles/composer-package/control
b/dockerfiles/composer-package/control
new file mode 100644
index 0000000..558d4ab
--- /dev/null
+++ b/dockerfiles/composer-package/control
@@ -0,0 +1,4 @@
+Package: composer-package
+Description: Runs tests via composer in /src
+Maintainer: Kunal Mehta <[email protected]>
+Depends: composer
diff --git a/dockerfiles/composer-test/Dockerfile
b/dockerfiles/composer-test/Dockerfile.template
similarity index 64%
rename from dockerfiles/composer-test/Dockerfile
rename to dockerfiles/composer-test/Dockerfile.template
index 1af5c3e..7cf2669 100644
--- a/dockerfiles/composer-test/Dockerfile
+++ b/dockerfiles/composer-test/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/composer:latest
+FROM {{ "composer" | image_tag }}
USER nobody
COPY run.sh /run.sh
diff --git a/dockerfiles/composer-test/changelog
b/dockerfiles/composer-test/changelog
new file mode 100644
index 0000000..b6f2e72
--- /dev/null
+++ b/dockerfiles/composer-test/changelog
@@ -0,0 +1,5 @@
+composer-test (0.1.0) wikimedia; urgency=medium
+
+ * Initial port to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Thu, 19 Oct 2017 14:17:47
+0200
diff --git a/dockerfiles/composer-test/control
b/dockerfiles/composer-test/control
new file mode 100644
index 0000000..7818789
--- /dev/null
+++ b/dockerfiles/composer-test/control
@@ -0,0 +1,4 @@
+Package: composer-package
+Description: Runs tests via composer for a change coming from a Zuul pipeline
+Maintainer: Kunal Mehta <[email protected]>
+Depends: composer
diff --git a/dockerfiles/composer/Dockerfile
b/dockerfiles/composer/Dockerfile.template
similarity index 63%
rename from dockerfiles/composer/Dockerfile
rename to dockerfiles/composer/Dockerfile.template
index 473d230..d93751c 100644
--- a/dockerfiles/composer/Dockerfile
+++ b/dockerfiles/composer/Dockerfile.template
@@ -1,12 +1,9 @@
-FROM wmfreleng/php:latest
+FROM {{ "php" | image_tag }}
USER root
-COPY .cache-buster-composer /.cache-buster-composer
-
RUN git clone --depth 1
https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer && \
- rm -rf /srv/composer/.git
-RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer
+ rm -rf /srv/composer/.git && ln -s /srv/composer/vendor/bin/composer
/usr/bin/composer
USER nobody
diff --git a/dockerfiles/composer/changelog b/dockerfiles/composer/changelog
new file mode 100644
index 0000000..1c1edc3
--- /dev/null
+++ b/dockerfiles/composer/changelog
@@ -0,0 +1,5 @@
+composer (0.1.0) wikimedia; urgency=medium
+
+ * Initial port to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Thu, 19 Oct 2017 13:46:31
+0200
diff --git a/dockerfiles/composer/control b/dockerfiles/composer/control
new file mode 100644
index 0000000..6966cb0
--- /dev/null
+++ b/dockerfiles/composer/control
@@ -0,0 +1,4 @@
+Package: composer
+Description: Composer base container for CI
+Maintainer: Kunal Mehta <[email protected]>
+Depends: php
diff --git a/dockerfiles/composer/prebuild.sh b/dockerfiles/composer/prebuild.sh
deleted file mode 100755
index ef2e5ca..0000000
--- a/dockerfiles/composer/prebuild.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# This is copied in Dockerfile to ensure that a build step grabs a fresh
-# copy of the git repo when it is updated rather than using a layer from
-# the local Docker cache.
-
-git ls-remote --exit-code
https://gerrit.wikimedia.org/r/p/integration/composer.git refs/heads/master >
.cache-buster-composer
diff --git a/dockerfiles/convert.sh b/dockerfiles/convert.sh
new file mode 100755
index 0000000..0392529
--- /dev/null
+++ b/dockerfiles/convert.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -eu
+dir=$1
+pkg=$2
+version="${3:-0.1.0}"
+pushd "$dir"
+dch --distribution wikimedia --force-distribution --package "${pkg}" 'Initial
conversion to docker-pkg' -c changelog --create -v "${version}"
+git mv Dockerfile Dockerfile.template
+echo "Package: ${pkg}" > control
+edit control
+popd
diff --git a/dockerfiles/npm/Dockerfile b/dockerfiles/npm/Dockerfile
deleted file mode 100644
index 2803c5e..0000000
--- a/dockerfiles/npm/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM wmfreleng/ci-jessie:latest
-
-# Install nodejs-legacy to provide /usr/bin/node alias
-RUN apt-get update && \
- apt-get install --yes \
- nodejs-legacy npm && \
- apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# DO NOT CHANGE VERSION WITHOUT INVOLVING Krinkle OR hashar
-RUN npm install -g [email protected]
-
-USER nobody
-
-ENTRYPOINT ["npm"]
-CMD ["--help"]
diff --git a/dockerfiles/npm/Dockerfile.template
b/dockerfiles/npm/Dockerfile.template
new file mode 100644
index 0000000..664847c
--- /dev/null
+++ b/dockerfiles/npm/Dockerfile.template
@@ -0,0 +1,13 @@
+FROM {{ "ci-jessie" | image_tag }}
+
+# DO NOT CHANGE VERSION WITHOUT INVOLVING Krinkle OR hashar
+ARG NPM_VERSION="3.8.3"
+
+# Install nodejs-legacy to provide /usr/bin/node alias
+RUN {{ "nodejs-legacy npm" | apt_install }} \
+ && npm install -g npm@${NPM_VERSION}
+
+USER nobody
+
+ENTRYPOINT ["npm"]
+CMD ["--help"]
diff --git a/dockerfiles/npm/changelog b/dockerfiles/npm/changelog
new file mode 100644
index 0000000..f15511a
--- /dev/null
+++ b/dockerfiles/npm/changelog
@@ -0,0 +1,5 @@
+ci-npm (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Mon, 23 Oct 2017 10:01:31
+0200
diff --git a/dockerfiles/operations-puppet/Dockerfile
b/dockerfiles/operations-puppet/Dockerfile
deleted file mode 100644
index d43bdcc..0000000
--- a/dockerfiles/operations-puppet/Dockerfile
+++ /dev/null
@@ -1,75 +0,0 @@
-FROM docker-registry.wikimedia.org/wikimedia-jessie:latest as builder
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
-
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get install --yes \
- ca-certificates \
- git \
- && \
- mkdir -p /tmp/cache && \
- git clone https://gerrit.wikimedia.org/r/operations/puppet
/tmp/cache/puppet
-
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get install --yes \
- build-essential \
- bundler \
- libmysqlclient-dev \
- locales \
- python-dev \
- python-pip \
- rubygems-integration \
- rake \
- ruby \
- ruby-dev \
- && \
- pip install pip==8.1.2 && \
- pip install tox==1.9.2 setuptools
-
-COPY .cache-buster-operations-puppet /.cache-buster-operations-puppet
-
-# Make all kinds of artifacts
-RUN cd /tmp/cache/puppet && \
- git remote update && \
- git prune origin && \
- git reset --hard $(cut -f1 /.cache-buster-operations-puppet) && \
- git clean -xqdf && \
- git tag -f 'docker-head' && \
- git gc --prune=now && \
- bundle install --clean --path="/tmp/cache/bundle" && \
- TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -v --notest && \
- mv .tox /tmp/cache/tox
-
-FROM wmfreleng/ci-jessie:latest
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
-
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get install --yes \
- build-essential \
- bundler \
- python-dev \
- python-pip \
- rubygems-integration \
- rake \
- ruby \
- ruby-dev && \
- apt-get clean && rm -rf /var/lib/apt/lists/* && \
- pip install pip==8.1.2 && \
- pip install tox==1.9.2 setuptools
-
-COPY --from=builder /tmp/cache /srv/workspace/.cache
-COPY bundle-config /srv/workspace/.cache/bundle-config
-
-RUN chown -R nobody /srv/workspace/.cache && \
- mkdir -p /tmp/cache && \
- mv /srv/workspace/.cache/puppet /tmp/cache/puppet && \
- mkdir -p /tmp/cache/puppet/.bundle && \
- mv /srv/workspace/.cache/bundle-config
/tmp/cache/puppet/.bundle/config && \
- mv /srv/workspace/.cache/tox /tmp/cache/puppet/.tox
-
-USER nobody
-WORKDIR /srv/workspace
-ENTRYPOINT /bin/bash /run.sh
-
-COPY run.sh /run.sh
diff --git a/dockerfiles/operations-puppet/Dockerfile.template
b/dockerfiles/operations-puppet/Dockerfile.template
new file mode 100644
index 0000000..ae1d996
--- /dev/null
+++ b/dockerfiles/operations-puppet/Dockerfile.template
@@ -0,0 +1,26 @@
+FROM {{ "ci-jessie" | image_tag }}
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+
+ENV PUPPET_DIR='/srv/workspace/puppet'
+
+{% set pkgs_to_install = """build-essential bundler python-dev \
+ python-pip rubygems-integration rake ruby ruby-dev ca-certificates
libmysqlclient-dev""" %}
+
+RUN {{ pkgs_to_install | apt_install }} \
+ && pip install pip==8.1.2 \
+ && pip install tox==1.9.2 setuptools \
+ && mkdir -p /srv/workspace \
+ && git clone https://gerrit.wikimedia.org/r/operations/puppet
"${PUPPET_DIR}" \
+ && cd "${PUPPET_DIR}" \
+ && git tag -f 'docker-head' && git gc --prune=now \
+ && TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -v --notest \
+ && bundle install --clean --path="${PUPPET_DIR}/.bundle" \
+ && chown -R nobody "${PUPPET_DIR}"
+
+USER nobody
+WORKDIR /srv/workspace
+ENTRYPOINT /bin/bash /run.sh
+
+COPY bundle-config "${PUPPET_DIR}/.bundle/bundle-config"
+COPY run.sh /run.sh
diff --git a/dockerfiles/operations-puppet/bundle-config
b/dockerfiles/operations-puppet/bundle-config
index be4ea90..79b71ce 100644
--- a/dockerfiles/operations-puppet/bundle-config
+++ b/dockerfiles/operations-puppet/bundle-config
@@ -1,3 +1,2 @@
-BUNDLE_PATH: "/srv/workspace/.cache/bundle"
BUNDLE_CLEAN: true
BUNDLE_DISABLE_SHARED_GEMS: '1'
diff --git a/dockerfiles/operations-puppet/changelog
b/dockerfiles/operations-puppet/changelog
new file mode 100644
index 0000000..5cfa177
--- /dev/null
+++ b/dockerfiles/operations-puppet/changelog
@@ -0,0 +1,5 @@
+operations-puppet (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Mon, 23 Oct 2017 10:18:11
+0200
diff --git a/dockerfiles/operations-puppet/control
b/dockerfiles/operations-puppet/control
new file mode 100644
index 0000000..854813c
--- /dev/null
+++ b/dockerfiles/operations-puppet/control
@@ -0,0 +1,3 @@
+Package: operations-puppet
+Description: Image for running CI tests on the puppet repo
+Maintainer: Antoine Musso <[email protected]>
diff --git a/dockerfiles/operations-puppet/prebuild.sh
b/dockerfiles/operations-puppet/prebuild.sh
deleted file mode 100755
index bc5ff61..0000000
--- a/dockerfiles/operations-puppet/prebuild.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# This is copied in Dockerfile to ensure that a build step grabs a fresh
-# copy of the git repo when it is updated rather than using a layer from
-# the local Docker cache.
-
-git ls-remote --exit-code
https://gerrit.wikimedia.org/r/p/operations/puppet.git refs/heads/production >
.cache-buster-operations-puppet
diff --git a/dockerfiles/operations-puppet/run.sh
b/dockerfiles/operations-puppet/run.sh
index 516abc8..14d8ce0 100755
--- a/dockerfiles/operations-puppet/run.sh
+++ b/dockerfiles/operations-puppet/run.sh
@@ -4,9 +4,6 @@
RAKE_TARGET=${RAKE_TARGET:-test}
-# Has to be in the same directory as in Dockerfile.build because of tox caching
-PUPPET_DIR="/tmp/cache/puppet"
-
LOG_DIR="/srv/workspace/log"
export LOG_DIR
diff --git a/dockerfiles/php/Dockerfile b/dockerfiles/php/Dockerfile
deleted file mode 100644
index 96a4450..0000000
--- a/dockerfiles/php/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM wmfreleng/ci-stretch:latest
-
-RUN apt-get update && \
- apt-get install --yes \
- php7.0-cli \
- # Needed for composer to install things from dist
- php7.0-zip \
- # Needed by libraries/MediaWiki
- php-ast php7.0-curl php7.0-dba php7.0-mbstring php-redis
php7.0-sqlite3 php-xdebug php7.0-xml && \
- apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Disable xdebug by default due to its performance impact
-RUN phpdismod xdebug
-
-USER nobody
-
-ENTRYPOINT ["php"]
-CMD ["--help"]
diff --git a/dockerfiles/php/Dockerfile.template
b/dockerfiles/php/Dockerfile.template
new file mode 100644
index 0000000..747ab93
--- /dev/null
+++ b/dockerfiles/php/Dockerfile.template
@@ -0,0 +1,10 @@
+FROM {{ "ci-stretch" | image_tag }}
+
+RUN {{ "php7.0-cli php7.0-zip php-ast php7.0-curl "
+ "php7.0-dba php7.0-mbstring php-redis php7.0-sqlite3 php-xdebug
php7.0-xml" | apt_install }} \
+ && phpdismod xdebug # Disable xdebug by default due to its performance
impact
+
+USER nobody
+
+ENTRYPOINT ["php"]
+CMD ["--help"]
diff --git a/dockerfiles/php/changelog b/dockerfiles/php/changelog
new file mode 100644
index 0000000..9edf2b6
--- /dev/null
+++ b/dockerfiles/php/changelog
@@ -0,0 +1,5 @@
+php (0.1.0) wikimedia; urgency=medium
+
+ * Initial port to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Thu, 19 Oct 2017 13:52:31
+0200
diff --git a/dockerfiles/php/control b/dockerfiles/php/control
new file mode 100644
index 0000000..e6094bc
--- /dev/null
+++ b/dockerfiles/php/control
@@ -0,0 +1,3 @@
+Package: php
+Description: Base php7 image for CI tasks
+Depends: ci-stretch
diff --git a/dockerfiles/tox/Dockerfile b/dockerfiles/tox/Dockerfile
deleted file mode 100644
index ab346b0..0000000
--- a/dockerfiles/tox/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM wmfreleng/ci-jessie:latest
-
-RUN apt-get update && \
- apt-get install --yes \
- python-pip \
- python3-pip \
- pypy \
- && \
- rm -rf /var/lib/apt/lists/*
-
-ARG PIP_DISABLE_PIP_VERSION_CHECK=1
-
-RUN pip install pip==8.1.2 && \
- apt-get remove --yes --purge python-pip python3-pip && \
- ln -s /usr/local/bin/pip /usr/bin/pip && \
- pip install tox==2.5.0 && \
- pip install setuptools && \
- rm -fR "$XDG_CACHE_HOME/pip"
-
-USER nobody
-WORKDIR /src
-ENTRYPOINT /bin/bash /run.sh
-COPY run.sh /run.sh
diff --git a/dockerfiles/tox/Dockerfile.template
b/dockerfiles/tox/Dockerfile.template
new file mode 100644
index 0000000..1bb3607
--- /dev/null
+++ b/dockerfiles/tox/Dockerfile.template
@@ -0,0 +1,16 @@
+FROM {{ "ci-jessie" | image_tag }}
+
+ARG PIP_DISABLE_PIP_VERSION_CHECK=1
+
+RUN {{ "python-pip pypy" | apt_install }} \
+ && pip install pip==8.1.2 \
+ && {{ "python-pip" | apt_remove }} \
+ && ln -s /usr/local/bin/pip /usr/bin/pip \
+ && pip install tox==2.5.0 \
+ && pip install setuptools \
+ && rm -fR "$XDG_CACHE_HOME/pip"
+
+USER nobody
+WORKDIR /src
+ENTRYPOINT /bin/bash /run.sh
+COPY run.sh /run.sh
diff --git a/dockerfiles/tox/changelog b/dockerfiles/tox/changelog
new file mode 100644
index 0000000..0c5531d
--- /dev/null
+++ b/dockerfiles/tox/changelog
@@ -0,0 +1,5 @@
+tox (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Mon, 23 Oct 2017 10:12:59
+0200
diff --git a/dockerfiles/tox/control b/dockerfiles/tox/control
new file mode 100644
index 0000000..f91be06
--- /dev/null
+++ b/dockerfiles/tox/control
@@ -0,0 +1,4 @@
+Package: tox
+Description: Docker image with tox installed.
+Depends: ci-jessie
+Maintainer: Antoine Musso <[email protected]>
--
To view, visit https://gerrit.wikimedia.org/r/385996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1cd5571de6a0f6bca841794582dc865d988f3ca
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
