Merge lp:~larryprice/libertine/lxd-etc-hosts into lp:libertine

[Larry Price]

Add container hostname to /etc/hosts in lxd containers.

Add container hostname to /etc/hosts in lxd containers.

I noticed a non-fatal error when running commands in lxd containers with `sudo -E -u $USER` complaining about not being able to resolve the hostname $CONTAINER_NAME. in this MP, I add the container hostname to /etc/hosts in the container if necessary during creation.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:403
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/419/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/786
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/649
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/649
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/649
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/649
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/796
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/777
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/777/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/777
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/777/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/777
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/777/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/777
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/777/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/419/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

+1

review: Approve

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/libertine/job/lp-libertine-autoland/197/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/789/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/799
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/780
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/780/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/780
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/780/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/780/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/780
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/780/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Reapproving due to intermittent test failure.

[Libertine CI Bot (libertine-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'python/libertine/LxdContainer.py'
--- python/libertine/LxdContainer.py	2017-02-24 15:27:34 +0000
+++ python/libertine/LxdContainer.py	2017-02-27 19:49:06 +0000
@@ -192,7 +192,7 @@
 
             host_path = os.path.join(host_root, filepath.lstrip("/"))
             if not os.path.exists(host_path):
-                utils.get_logger().warning("Syncing file: {}:{}".format(filepath, host_path))
+                utils.get_logger().info("Syncing file: {}:{}".format(filepath, host_path))
                 os.makedirs(os.path.dirname(host_path), exist_ok=True)
                 with open(host_path, 'wb') as f:
                     f.write(container.files.get(filepath))
@@ -237,7 +237,7 @@
         if broken_container_links[i] == container_link_endpoints[i] or container_link_endpoints[i].startswith(root_path):
             continue # link wasn't found
 
-        host_linkpath = "{}/{}".format(root_path, container_link_endpoints[i])
+        host_linkpath = os.path.join(root_path, container_link_endpoints[i].lstrip('/'))
         if not os.path.exists(host_linkpath):
             os.makedirs(os.path.dirname(host_linkpath), exist_ok=True)
             with open(host_linkpath, 'wb') as f:
@@ -351,6 +351,18 @@
     _lxd_save(container, 'Saving bind mounts for container \'{}\' raised:'.format(container.name))
 
 
+def _setup_etc_hosts(container):
+    self_host = '127.0.1.1 %s' % container.name
+    hosts = container.files.get("/etc/hosts")
+
+    lines = [line for line in hosts.decode('utf-8').split('\n')]
+    found = [line for line in lines if line == self_host]
+    if len(found) == 0:
+        lines.insert(1, self_host)
+
+    container.files.put("/etc/hosts", '\n'.join(lines).encode('utf-8'))
+
+
 def update_libertine_profile(client):
     try:
         profile = client.profiles.get('libertine')
@@ -416,6 +428,7 @@
         self._create_libertine_user_data_dir()
 
         _setup_bind_mount_service(self._container, uid, username)
+        _setup_etc_hosts(self._container)
 
         if multiarch and self.architecture == 'amd64':
             utils.get_logger().info("Adding i386 multiarch support to container '{}'".format(self.container_id))