jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/388447 )
Change subject: Convert ci-jessie and ci-stretch
......................................................................
Convert ci-jessie and ci-stretch
Change-Id: I107545032e3b183d5ceef8e5689132a7c41ffb64
---
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
A dockerfiles/docker-pkg-config.yaml
9 files changed, 44 insertions(+), 39 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
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..52a3454
--- /dev/null
+++ b/dockerfiles/ci-jessie/control
@@ -0,0 +1,3 @@
+Package: ci-jessie
+Description: Base jessie image for CI tasks
+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..fec6d6e
--- /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/docker-pkg-config.yaml
b/dockerfiles/docker-pkg-config.yaml
new file mode 100644
index 0000000..8a2dbd6
--- /dev/null
+++ b/dockerfiles/docker-pkg-config.yaml
@@ -0,0 +1,3 @@
+registry: docker-registry.wikimedia.org
+seed_image: docker-registry.wikimedia.org/wikimedia-jessie:latest
+namespace: ci
--
To view, visit https://gerrit.wikimedia.org/r/388447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I107545032e3b183d5ceef8e5689132a7c41ffb64
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
