jenkins-bot has submitted this change and it was merged.
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, 42 insertions(+), 1 deletion(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/build.py b/build.py
index 0ee1749..064b685 100755
--- a/build.py
+++ b/build.py
@@ -5,6 +5,7 @@
import argparse
import os
import subprocess
+import itertools
# The docker binary to use for executing commands
@@ -44,6 +45,7 @@
'golang/web',
]
},
+'trusty-legacy': {}
}
@@ -127,7 +129,7 @@
argparser.add_argument(
'image',
help='Which image to build. Will also build all ancestors +
descendents of image',
-choices=lineage_of('base')
+choices=list(itertools.chain(*[lineage_of(base) for base in
IMAGES.keys]))
)
argparser.add_argument(
'--push',
diff --git a/trusty-legacy/.dockerignore b/trusty-legacy/.dockerignore
new file mode 100644
index 000..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 000..80cc70a
--- /dev/null
+++ b/trusty-legacy/Dockerfile.template
@@ -0,0 +1,23 @@
+# 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 en_US.UTF-8 Locale, since otherwise it defaults to the C one
(which sucks!)
+# For debian we use C.UTF-8, which doesn't seem to work on ubuntu?!
+RUN locale-gen en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
diff --git a/trusty-legacy/nsswitch.conf b/trusty-legacy/nsswitch.conf
new file mode 100644
index 000..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 000..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: merged
Gerrit-Change-Id: Iadb312b7ef693002dfdd47df042a421ad8fd133c
Gerrit-PatchSet: 4
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
