Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315706

Change subject: Add legacy trusty container
......................................................................

Add legacy trusty container

Bug: T148054
Change-Id: Iadb312b7ef693002dfdd47df042a421ad8fd133c
---
M build.py
A trusty-legacy/.dockerignore
A trusty-legacy/Dockerfile.template
A trusty-legacy/nsswitch.conf
A trusty-legacy/tools.list
5 files changed, 39 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/docker-images/toollabs-images 
refs/changes/06/315706/1

diff --git a/build.py b/build.py
index 0ee1749..92d58e4 100755
--- a/build.py
+++ b/build.py
@@ -44,6 +44,7 @@
             'golang/web',
         ]
     },
+    'legacy-trusty': {}
 }
 
 
diff --git a/trusty-legacy/.dockerignore b/trusty-legacy/.dockerignore
new file mode 100644
index 0000000..689cf97
--- /dev/null
+++ b/trusty-legacy/.dockerignore
@@ -0,0 +1 @@
+Dockerfile.template
diff --git a/trusty-legacy/Dockerfile.template 
b/trusty-legacy/Dockerfile.template
new file mode 100644
index 0000000..b508ec1
--- /dev/null
+++ b/trusty-legacy/Dockerfile.template
@@ -0,0 +1,22 @@
+# Base toollabs user image
+# Name: docker-registry.tools.wmflabs.org/toollabs-trusty-legacy
+# Source image: Ubuntu Trusty
+# Sets up:
+#   Extra Apt repo: Tools repo
+#   Users and Groups from labs LDAP (with mount required for nslcd)
+FROM docker-registry.tools.wmflabs.org/wikimedia-trusty
+
+# Add tools debian repo to this container
+ADD tools.list /etc/apt/sources.list.d/tools.list
+
+RUN apt-get update
+
+# Setup NSS with LDAP. This requires that we mount /var/run/nslcd/socket from 
the
+# underlying labs host to the container. If not mounted, it will fallback 
gracefully
+# and just not use LDAP for NSS.
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes 
--no-install-recommends libnss-ldapd locales
+ADD nsswitch.conf /etc/nsswitch.conf
+
+# Setup the C.UTF-8 Locale, since otherwise it defaults to the C one (which 
sucks!)
+RUN locale-gen C.UTF-8
+ENV LC_ALL C.UTF-8
diff --git a/trusty-legacy/nsswitch.conf b/trusty-legacy/nsswitch.conf
new file mode 100644
index 0000000..61304f3
--- /dev/null
+++ b/trusty-legacy/nsswitch.conf
@@ -0,0 +1,14 @@
+passwd:         compat ldap
+group:          compat ldap
+shadow:         compat
+gshadow:        files
+
+hosts:          files dns
+networks:       files
+
+protocols:      db files
+services:       db files
+ethers:         db files ldap
+rpc:            db files
+
+netgroup:       nis
diff --git a/trusty-legacy/tools.list b/trusty-legacy/tools.list
new file mode 100644
index 0000000..2f1c56f
--- /dev/null
+++ b/trusty-legacy/tools.list
@@ -0,0 +1 @@
+deb [trusted=yes] http://deb.tools.wmflabs.org/repo trusty-tools main

-- 
To view, visit https://gerrit.wikimedia.org/r/315706
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadb312b7ef693002dfdd47df042a421ad8fd133c
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to