Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403907 )
Change subject: Migrate npm-test images to docker-pkg
......................................................................
Migrate npm-test images to docker-pkg
The npm-test stretch ones will be done as part of another change.
Update:
change-propagation-npm-node-6-docker
graphoid-npm-node-6-docker
kartotherian-npm-node-6-docker
mathoid-npm-node-6-docker
tilerator-npm-node-6-docker
trending-edits-npm-node-6-docker
Bug: T177276
Change-Id: I14fef7af7e9ea364ec3fac4a197c9c6669a5f5df
---
A dockerfiles/npm-test-graphoid/.gitignore
D dockerfiles/npm-test-graphoid/Dockerfile
A dockerfiles/npm-test-graphoid/Dockerfile.template
A dockerfiles/npm-test-graphoid/changelog
A dockerfiles/npm-test-graphoid/control
M dockerfiles/npm-test-graphoid/example-run.sh
A dockerfiles/npm-test-librdkafka/.gitignore
D dockerfiles/npm-test-librdkafka/Dockerfile
A dockerfiles/npm-test-librdkafka/Dockerfile.template
A dockerfiles/npm-test-librdkafka/changelog
M dockerfiles/npm-test-librdkafka/example-run.sh
M dockerfiles/npm-test-maps-service/.dockerignore
A dockerfiles/npm-test-maps-service/.gitignore
D dockerfiles/npm-test-maps-service/Dockerfile
A dockerfiles/npm-test-maps-service/Dockerfile.template
A dockerfiles/npm-test-maps-service/changelog
M dockerfiles/npm-test-maps-service/example-run.sh
A dockerfiles/npm-test-mathoid/.gitignore
D dockerfiles/npm-test-mathoid/Dockerfile
A dockerfiles/npm-test-mathoid/Dockerfile.template
A dockerfiles/npm-test-mathoid/changelog
M dockerfiles/npm-test-mathoid/example-run.sh
M jjb/mediawiki-services.yaml
23 files changed, 102 insertions(+), 73 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/07/403907/1
diff --git a/dockerfiles/npm-test-graphoid/.gitignore
b/dockerfiles/npm-test-graphoid/.gitignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/npm-test-graphoid/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/npm-test-graphoid/Dockerfile
b/dockerfiles/npm-test-graphoid/Dockerfile
deleted file mode 100644
index c9aa1f2..0000000
--- a/dockerfiles/npm-test-graphoid/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM wmfreleng/npm-test
-
-USER root
-RUN apt-get update \
- && apt-get install --yes \
- libcairo2-dev \
- libgif-dev \
- libpango1.0-dev \
- libjpeg62-turbo-dev \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
-USER nobody
diff --git a/dockerfiles/npm-test-graphoid/Dockerfile.template
b/dockerfiles/npm-test-graphoid/Dockerfile.template
new file mode 100644
index 0000000..4a1fe07
--- /dev/null
+++ b/dockerfiles/npm-test-graphoid/Dockerfile.template
@@ -0,0 +1,7 @@
+FROM {{ "npm-test" | image_tag }}
+
+USER root
+
+RUN {{ "libcairo2-dev libgif-dev libpango1.0-dev libjpeg62-turbo-dev" |
apt_install }}
+
+USER nobody
diff --git a/dockerfiles/npm-test-graphoid/changelog
b/dockerfiles/npm-test-graphoid/changelog
new file mode 100644
index 0000000..b299bda
--- /dev/null
+++ b/dockerfiles/npm-test-graphoid/changelog
@@ -0,0 +1,5 @@
+npm-test-graphoid (0.1.0) wikimedia; urgency=medium
+
+ * Initial port to docker-pkg.
+
+ -- Antoine Musso <[email protected]> Fri, 12 Jan 2018 11:45:52 +0100
diff --git a/dockerfiles/npm-test-graphoid/control
b/dockerfiles/npm-test-graphoid/control
new file mode 100644
index 0000000..ae1d238
--- /dev/null
+++ b/dockerfiles/npm-test-graphoid/control
@@ -0,0 +1 @@
+Depends: npm-test
diff --git a/dockerfiles/npm-test-graphoid/example-run.sh
b/dockerfiles/npm-test-graphoid/example-run.sh
index 8a9b640..de2788d 100644
--- a/dockerfiles/npm-test-graphoid/example-run.sh
+++ b/dockerfiles/npm-test-graphoid/example-run.sh
@@ -2,12 +2,13 @@
set -eux -o pipefail
-install --mode 777 --directory log cache src
+install --mode 2777 --directory cache log src
+(
cd src
git init
git fetch --quiet --depth 1
"https://gerrit.wikimedia.org/r/mediawiki/services/graphoid"; "master"
git checkout FETCH_HEAD
-cd ..
+)
docker run \
--rm --tty \
@@ -15,4 +16,4 @@
--volume /"$(pwd)"/log://var/lib/jenkins/log \
--volume /"$(pwd)"/cache://cache \
--volume /"$(pwd)"/src://src \
- wmfreleng/npm-test-graphoid:latest
+ docker-registry.wikimedia.org/releng/npm-test-graphoid:latest
diff --git a/dockerfiles/npm-test-librdkafka/.gitignore
b/dockerfiles/npm-test-librdkafka/.gitignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/npm-test-librdkafka/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/npm-test-librdkafka/Dockerfile
b/dockerfiles/npm-test-librdkafka/Dockerfile
deleted file mode 100644
index 6e273e4..0000000
--- a/dockerfiles/npm-test-librdkafka/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM wmfreleng/npm-test
-
-USER root
-RUN apt-get update \
- && apt-get install --yes \
- libsasl2-dev \
- && apt-get install --yes -t jessie-wikimedia \
- librdkafka-dev \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
-USER nobody
diff --git a/dockerfiles/npm-test-librdkafka/Dockerfile.template
b/dockerfiles/npm-test-librdkafka/Dockerfile.template
new file mode 100644
index 0000000..d56df1f
--- /dev/null
+++ b/dockerfiles/npm-test-librdkafka/Dockerfile.template
@@ -0,0 +1,7 @@
+FROM {{ "npm-test" | image_tag }}
+
+USER root
+
+RUN {{ "libsasl2-dev librdkafka-dev/jessie-wikimedia" | apt_install }}
+
+USER nobody
diff --git a/dockerfiles/npm-test-librdkafka/changelog
b/dockerfiles/npm-test-librdkafka/changelog
new file mode 100644
index 0000000..616d900
--- /dev/null
+++ b/dockerfiles/npm-test-librdkafka/changelog
@@ -0,0 +1,5 @@
+npm-test-librdkafka (0.1.0) wikimedia; urgency=medium
+
+ * Initial port to docker-pkg.
+
+ -- Antoine Musso <[email protected]> Fri, 12 Jan 2018 11:45:52 +0100
diff --git a/dockerfiles/npm-test-librdkafka/example-run.sh
b/dockerfiles/npm-test-librdkafka/example-run.sh
index 5ad5f23..45f8a35 100644
--- a/dockerfiles/npm-test-librdkafka/example-run.sh
+++ b/dockerfiles/npm-test-librdkafka/example-run.sh
@@ -15,4 +15,4 @@
--volume /"$(pwd)"/log://var/lib/jenkins/log \
--volume /"$(pwd)"/cache://cache \
--volume /"$(pwd)"/src://src \
- wmfreleng/npm-test-librdkafka:latest
+ docker-registry.wikimedia.org/releng/npm-test-librdkafka:latest
diff --git a/dockerfiles/npm-test-maps-service/.dockerignore
b/dockerfiles/npm-test-maps-service/.dockerignore
index 139ce78..a1e4918 100644
--- a/dockerfiles/npm-test-maps-service/.dockerignore
+++ b/dockerfiles/npm-test-maps-service/.dockerignore
@@ -1,3 +1,3 @@
/cache
-/log
-/src
+/log*
+/src*
diff --git a/dockerfiles/npm-test-maps-service/.gitignore
b/dockerfiles/npm-test-maps-service/.gitignore
new file mode 100644
index 0000000..a1e4918
--- /dev/null
+++ b/dockerfiles/npm-test-maps-service/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log*
+/src*
diff --git a/dockerfiles/npm-test-maps-service/Dockerfile
b/dockerfiles/npm-test-maps-service/Dockerfile
deleted file mode 100644
index 946e063..0000000
--- a/dockerfiles/npm-test-maps-service/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM wmfreleng/npm-test
-
-USER root
-RUN apt-get update \
- && apt-get install --yes \
- libcairo2-dev \
- libgif-dev \
- libpango1.0-dev \
- libjpeg62-turbo-dev \
- fonts-dejavu \
- libboost-filesystem-dev \
- libboost-program-options-dev \
- libboost-regex-dev \
- libboost-system-dev \
- libboost-thread-dev \
- libgdal-dev \
- libicu-dev \
- libpq-dev \
- libcurl4-gnutls-dev \
- libproj-dev \
- libtiff-dev \
- libwebp5 \
- libmapbox-variant-dev \
- libmapnik-dev \
- mapnik-utils \
- && apt-get install --yes -t jessie-wikimedia \
- librdkafka-dev \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
-USER nobody
diff --git a/dockerfiles/npm-test-maps-service/Dockerfile.template
b/dockerfiles/npm-test-maps-service/Dockerfile.template
new file mode 100644
index 0000000..b3f127f
--- /dev/null
+++ b/dockerfiles/npm-test-maps-service/Dockerfile.template
@@ -0,0 +1,31 @@
+FROM {{ "npm-test" | image_tag }}
+
+USER root
+
+{% set deps|replace('\n', ' ') -%}
+libcairo2-dev
+libgif-dev
+libpango1.0-dev
+libjpeg62-turbo-dev
+fonts-dejavu
+libboost-filesystem-dev
+libboost-program-options-dev
+libboost-regex-dev
+libboost-system-dev
+libboost-thread-dev
+libgdal-dev
+libicu-dev
+libpq-dev
+libcurl4-gnutls-dev
+libproj-dev
+libtiff-dev
+libwebp5
+libmapbox-variant-dev
+libmapnik-dev
+mapnik-utils
+librdkafka-dev/jessie-wikimedia
+{%- endset -%}
+
+RUN {{ deps | apt_install }}
+
+USER nobody
diff --git a/dockerfiles/npm-test-maps-service/changelog
b/dockerfiles/npm-test-maps-service/changelog
new file mode 100644
index 0000000..1ae2379
--- /dev/null
+++ b/dockerfiles/npm-test-maps-service/changelog
@@ -0,0 +1,5 @@
+npm-test-maps-service (0.1.0) wikimedia; urgency=medium
+
+ * Initial port to docker-pkg.
+
+ -- Antoine Musso <[email protected]> Fri, 12 Jan 2018 11:45:52 +0100
diff --git a/dockerfiles/npm-test-maps-service/example-run.sh
b/dockerfiles/npm-test-maps-service/example-run.sh
index 303cdf3..ef2c8f7 100644
--- a/dockerfiles/npm-test-maps-service/example-run.sh
+++ b/dockerfiles/npm-test-maps-service/example-run.sh
@@ -17,7 +17,7 @@
--volume /"$(pwd)/log-$repo"://var/lib/jenkins/log \
--volume /"$(pwd)"/cache://cache \
--volume /"$(pwd)/src-$repo"://src \
- wmfreleng/npm-test-maps-service:latest || {
+ docker-registry.wikimedia.org/releng/npm-test-maps-service:latest || {
err="$err$repo failed "
}
done
diff --git a/dockerfiles/npm-test-mathoid/.gitignore
b/dockerfiles/npm-test-mathoid/.gitignore
new file mode 100644
index 0000000..139ce78
--- /dev/null
+++ b/dockerfiles/npm-test-mathoid/.gitignore
@@ -0,0 +1,3 @@
+/cache
+/log
+/src
diff --git a/dockerfiles/npm-test-mathoid/Dockerfile
b/dockerfiles/npm-test-mathoid/Dockerfile
deleted file mode 100644
index 0984563..0000000
--- a/dockerfiles/npm-test-mathoid/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM wmfreleng/npm-test
-
-USER root
-RUN apt-get update \
- && apt-get install --yes \
- librsvg2-dev \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
-USER nobody
diff --git a/dockerfiles/npm-test-mathoid/Dockerfile.template
b/dockerfiles/npm-test-mathoid/Dockerfile.template
new file mode 100644
index 0000000..f50f770
--- /dev/null
+++ b/dockerfiles/npm-test-mathoid/Dockerfile.template
@@ -0,0 +1,7 @@
+FROM {{ "npm-test" | image_tag }}
+
+USER root
+
+RUN {{ "librsvg2-dev" | apt_install }}
+
+USER nobody
diff --git a/dockerfiles/npm-test-mathoid/changelog
b/dockerfiles/npm-test-mathoid/changelog
new file mode 100644
index 0000000..4ad2409
--- /dev/null
+++ b/dockerfiles/npm-test-mathoid/changelog
@@ -0,0 +1,5 @@
+npm-test-mathoid (0.1.0) wikimedia; urgency=medium
+
+ * Initial port to docker-pkg.
+
+ -- Antoine Musso <[email protected]> Fri, 12 Jan 2018 11:45:52 +0100
diff --git a/dockerfiles/npm-test-mathoid/example-run.sh
b/dockerfiles/npm-test-mathoid/example-run.sh
index 96b372d..701a8e9 100644
--- a/dockerfiles/npm-test-mathoid/example-run.sh
+++ b/dockerfiles/npm-test-mathoid/example-run.sh
@@ -6,15 +6,16 @@
mkdir -m 777 -p src
mkdir -m 777 -p cache
+(
cd src
git init
git fetch --quiet --depth 1
"https://gerrit.wikimedia.org/r/mediawiki/services/mathoid";
git checkout FETCH_HEAD
-cd ..
+)
docker run \
--rm --tty \
--volume /"$(pwd)"/log://var/lib/jenkins/log \
--volume /"$(pwd)"/cache://cache \
--volume /"$(pwd)"/src://src \
- wmfreleng/npm-test-mathoid:latest
+ docker-registry.wikimedia.org/releng/npm-test-mathoid:latest
diff --git a/jjb/mediawiki-services.yaml b/jjb/mediawiki-services.yaml
index 80a04d2..25e306a 100644
--- a/jjb/mediawiki-services.yaml
+++ b/jjb/mediawiki-services.yaml
@@ -5,7 +5,7 @@
jobs:
- '{name}-{repository}-npm-node-6-jessie'
- '{name}-npm-node-6-docker':
- docker_image_var: wmfreleng/npm-test-librdkafka:v2017.12.11.16.37
+ docker_image_var:
docker-registry.wikimedia.org/releng/npm-test-librdkafka:0.1.0
- project:
name: chromium-render
@@ -33,7 +33,7 @@
- deploy
jobs:
- '{name}-npm-node-6-docker':
- docker_image_var: wmfreleng/npm-test-graphoid:v2017.12.11.16.37
+ docker_image_var:
docker-registry.wikimedia.org/releng/npm-test-graphoid:0.1.0
- '{name}-{repository}-npm-node-6-jessie'
- project:
@@ -43,7 +43,7 @@
jobs:
- '{name}-{repository}-npm-node-6-jessie'
- '{name}-npm-node-6-docker':
- docker_image_var: wmfreleng/npm-test-maps-service:v2017.12.11.16.37
+ docker_image_var:
docker-registry.wikimedia.org/releng/npm-test-maps-service:0.1.0
- project:
name: 'mathoid'
@@ -52,7 +52,7 @@
jobs:
- '{name}-{repository}-npm-node-6-jessie'
- '{name}-npm-node-6-docker':
- docker_image_var: wmfreleng/npm-test-mathoid:v2017.12.11.16.37
+ docker_image_var:
docker-registry.wikimedia.org/releng/npm-test-mathoid:0.1.0
- project:
name: 'mobileapps'
@@ -68,7 +68,7 @@
jobs:
- '{name}-{repository}-npm-node-6-jessie'
- '{name}-npm-node-6-docker':
- docker_image_var: wmfreleng/npm-test-maps-service:v2017.12.11.16.37
+ docker_image_var:
docker-registry.wikimedia.org/releng/npm-test-maps-service:0.1.0
- project:
name: 'trending-edits'
@@ -77,4 +77,4 @@
jobs:
- '{name}-{repository}-npm-node-6-jessie'
- '{name}-npm-node-6-docker':
- docker_image_var: wmfreleng/npm-test-librdkafka:v2017.12.11.16.37
+ docker_image_var:
docker-registry.wikimedia.org/releng/npm-test-librdkafka:0.1.0
--
To view, visit https://gerrit.wikimedia.org/r/403907
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I14fef7af7e9ea364ec3fac4a197c9c6669a5f5df
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
