Merge lp:~larryprice/libertine/bind-mount-gui into lp:libertine

[Larry Price]

Implement GUI for adding and removing bind-mounts in containers.

Implement GUI for adding and removing bind-mounts to containers.

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

FAILED: Continuous integration, rev:395
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/388/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/742/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/752
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/733/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/733/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/733/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/733/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:396
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/389/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/743/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/753
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/734/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/734/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/734/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/734/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:397
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/391/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/745/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/755
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/736/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/736/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/736/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/736/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:398
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/392/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/746/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/756
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/737
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/737/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/737/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/737
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/737/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/737/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:398
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/393/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/747
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/613
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/613
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/613
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/613
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/757
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/738
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/738/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/738
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/738/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/738
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/738/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/738
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/738/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

As mentioned on irc, the FileDialog pops up as a very small horizontal line and I happened to resize it by chance. If there is a way to try to set a default size for the dialog, that would be great.

Also, a couple of code style nitpicks inline.

review: Needs Information

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

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

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok, +1.

I will note that there isn't any way to protect against the weird horizontal line FileDialog I saw, so we'll leave it as is and hope I'm the outlier.

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/186/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/761/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/771
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/752
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/752/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/752
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/752/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/752
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/752/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/752/console

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'common/CMakeLists.txt'
--- common/CMakeLists.txt	2017-02-08 14:09:03 +0000
+++ common/CMakeLists.txt	2017-02-22 20:19:40 +0000
@@ -1,6 +1,7 @@
 add_library(${LIBERTINE_COMMON}
     ContainerAppsList.cpp
     ContainerArchivesList.cpp
+    ContainerBindMountsList.cpp
     ContainersConfig.cpp
     ContainerConfigList.cpp
     ContainerManager.cpp

=== modified file 'common/ContainerArchivesList.cpp'
--- common/ContainerArchivesList.cpp	2017-02-08 14:57:34 +0000
+++ common/ContainerArchivesList.cpp	2017-02-22 20:19:40 +0000
@@ -20,6 +20,7 @@
 
 #include "common/ContainerConfigList.h"
 
+
 ContainerArchivesList::
 ContainerArchivesList(ContainerConfigList* container_config_list,
                       QObject* parent)

=== modified file 'common/ContainerArchivesList.h'
--- common/ContainerArchivesList.h	2017-02-08 13:10:10 +0000
+++ common/ContainerArchivesList.h	2017-02-22 20:19:40 +0000
@@ -18,14 +18,13 @@
  */
 #pragma once
 
+#include "common/ContainersConfig.h"
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QList>
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include "common/ContainersConfig.h"
-
-
-class ContainerArchives;
+
+
 class ContainerConfigList;
 
 class ContainerArchivesList

=== added file 'common/ContainerBindMountsList.cpp'
--- common/ContainerBindMountsList.cpp	1970-01-01 00:00:00 +0000
+++ common/ContainerBindMountsList.cpp	2017-02-22 20:19:40 +0000
@@ -0,0 +1,87 @@
+/**
+ * @file ContainerBindMountsList.cpp
+ * @brief Libertine Manager list of all mapped directories
+ */
+/*
+ * Copyright 2017 Canonical Ltd
+ *
+ * Libertine is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3, as published by the
+ * Free Software Foundation.
+ *
+ * Libertine is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "common/ContainerBindMountsList.h"
+
+#include "common/ContainerConfigList.h"
+
+
+ContainerBindMountsList::
+ContainerBindMountsList(ContainerConfigList* container_config_list,
+                      QObject* parent)
+: QAbstractListModel(parent)
+, container_config_list_(container_config_list)
+{ }
+
+
+void ContainerBindMountsList::
+setContainerBindMounts(QString const& container_id)
+{
+  mounts_ = container_config_list_->getBindMountsForContainer(container_id);
+
+  beginResetModel();
+  endResetModel();
+}
+
+
+bool ContainerBindMountsList::
+empty() const noexcept
+{ return mounts_.empty(); }
+
+
+ContainerBindMountsList::size_type ContainerBindMountsList::
+size() const noexcept
+{ return mounts_.count(); }
+
+
+int ContainerBindMountsList::
+rowCount(QModelIndex const&) const
+{
+  return this->size();
+}
+
+
+QHash<int, QByteArray> ContainerBindMountsList::
+roleNames() const
+{
+  QHash<int, QByteArray> roles;
+  roles[static_cast<int>(DataRole::BindMountPath)] = "path";
+
+  return roles;
+}
+
+
+QVariant ContainerBindMountsList::
+data(QModelIndex const& index, int role) const
+{
+  QVariant result;
+
+  if (index.isValid() && index.row() <= mounts_.count())
+  {
+    switch (static_cast<DataRole>(role))
+    {
+      case DataRole::BindMountPath:
+        result = mounts_[index.row()].path;
+        break;
+      case DataRole::Error:
+        break;
+    }
+  }
+
+  return result;
+}

=== added file 'common/ContainerBindMountsList.h'
--- common/ContainerBindMountsList.h	1970-01-01 00:00:00 +0000
+++ common/ContainerBindMountsList.h	2017-02-22 20:19:40 +0000
@@ -0,0 +1,76 @@
+/**
+ * @file ContainerBindMountsList.h
+ * @brief Libertine Manager list of extra container archives (PPAs)
+ */
+/*
+ * Copyright 2017 Canonical Ltd
+ *
+ * Libertine is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3, as published by the
+ * Free Software Foundation.
+ *
+ * Libertine is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "common/ContainersConfig.h"
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+
+
+class ContainerConfigList;
+
+class ContainerBindMountsList
+: public QAbstractListModel
+{
+  Q_OBJECT
+
+public:
+  using BindMountsList = QList<ContainersConfig::Container::BindMount>;
+  using iterator = BindMountsList::iterator;
+  using size_type = BindMountsList::size_type;
+
+  enum class DataRole
+  : int
+  {
+    BindMountPath = Qt::UserRole + 1,
+    Error
+  };
+
+public:
+  explicit
+  ContainerBindMountsList(ContainerConfigList* container_config_list,
+                        QObject* parent = nullptr);
+
+  virtual
+  ~ContainerBindMountsList() = default;
+
+  Q_INVOKABLE void
+  setContainerBindMounts(QString const& container_id);
+
+  Q_INVOKABLE bool
+  empty() const noexcept;
+
+  size_type
+  size() const noexcept;
+
+  int
+  rowCount(QModelIndex const& parent = QModelIndex()) const;
+
+  QHash<int, QByteArray>
+  roleNames() const;
+
+  QVariant
+  data(QModelIndex const& index, int role = Qt::DisplayRole) const;
+
+private:
+  ContainerConfigList* container_config_list_;
+  BindMountsList       mounts_;
+};

=== modified file 'common/ContainerConfigList.cpp'
--- common/ContainerConfigList.cpp	2017-02-08 15:08:24 +0000
+++ common/ContainerConfigList.cpp	2017-02-22 20:19:40 +0000
@@ -34,9 +34,9 @@
 #include <QtCore/QStandardPaths>
 #include <QtCore/QString>
 #include <QtCore/QSysInfo>
-
 #include <sys/file.h>
 
+
 namespace
 {
 static constexpr auto POLICY_INSTALLED_VERSION_LINE = 1;
@@ -235,6 +235,13 @@
 }
 
 
+QList<ContainersConfig::Container::BindMount> ContainerConfigList::
+getBindMountsForContainer(QString const& container_id)
+{
+  return find_container_by_id(containers_config_->containers, container_id).mounts;
+}
+
+
 QString ContainerConfigList::
 getContainerType(QString const& container_id)
 {

=== modified file 'common/ContainerConfigList.h'
--- common/ContainerConfigList.h	2017-02-13 20:57:03 +0000
+++ common/ContainerConfigList.h	2017-02-22 20:19:40 +0000
@@ -18,15 +18,15 @@
  */
 #pragma once
 
+
+#include "common/ContainersConfig.h"
+#include <memory>
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QJsonObject>
 #include <QtCore/QList>
-#include <memory>
-#include "common/ContainersConfig.h"
+
 
 class ContainerApps;
-class ContainerArchives;
-class ContainerConfig;
 class LibertineConfig;
 
 
@@ -44,9 +44,7 @@
              NOTIFY defaultContainerChanged)
 
 public:
-  using ConfigList = QList<ContainerConfig*>;
-  using iterator = ConfigList::iterator;
-  using size_type = ConfigList::size_type;
+  using size_type = QList<ContainersConfig::Container>::size_type;
 
   static const QString Json_container_list;
   static const QString Json_default_container;
@@ -74,12 +72,14 @@
   /**
    * Constructs a container config list from a container config.
    */
+  explicit
   ContainerConfigList(LibertineConfig const* config,
                       QObject*               parent = nullptr);
 
   /**
    * Constructs a container config list from a raw json string
    */
+  explicit
   ContainerConfigList(QJsonObject const& json_object,
                       QObject*               parent = nullptr);
 
@@ -127,6 +127,9 @@
   QList<ContainersConfig::Container::Archive>
   getArchivesForContainer(QString const& container_id);
 
+  QList<ContainersConfig::Container::BindMount>
+  getBindMountsForContainer(QString const& container_id);
+
   Q_INVOKABLE QString
   getContainerType(QString const& container_id);
 
@@ -228,7 +231,6 @@
 
 private:
   LibertineConfig const*            config_;
-  ConfigList                        configs_;
   QString                           default_container_id_;
   std::unique_ptr<ContainersConfig> containers_config_;
 };

=== modified file 'common/ContainersConfig.cpp'
--- common/ContainersConfig.cpp	2017-02-13 22:18:18 +0000
+++ common/ContainersConfig.cpp	2017-02-22 20:19:40 +0000
@@ -12,7 +12,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "ContainersConfig.h"
 
 #include <QJsonArray>
@@ -63,6 +62,19 @@
 }
 
 
+ContainersConfig::Container::BindMount::
+BindMount(QString const& json)
+: path(json)
+{ }
+
+
+QString ContainersConfig::Container::BindMount::
+dump() const
+{
+  return path;
+}
+
+
 ContainersConfig::Container::InstalledApp::
 InstalledApp(QJsonObject const& json)
 : status_(try_get_string(json, "appStatus"))
@@ -110,6 +122,11 @@
   {
     installed_apps.append(InstalledApp(app.toObject()));
   }
+
+  for (auto const& mount: json["bindMounts"].toArray())
+  {
+    mounts.append(BindMount(mount.toString()));
+  }
 }
 
 
@@ -138,6 +155,13 @@
   }
   object["installedApps"] = installed_apps_list;
 
+  QJsonArray mounts_list;
+  for (auto const& mount: mounts)
+  {
+    mounts_list.append(mount.dump());
+  }
+  object["bindMounts"] = mounts_list;
+
   return object;
 }
 

=== modified file 'common/ContainersConfig.h'
--- common/ContainersConfig.h	2017-02-13 22:18:18 +0000
+++ common/ContainersConfig.h	2017-02-22 20:19:40 +0000
@@ -73,6 +73,19 @@
       QString status;
     };
 
+
+    class BindMount
+    {
+    public:
+      explicit BindMount(QString const& json);
+      virtual ~BindMount() = default;
+
+      QString dump() const;
+
+    public:
+      QString path;
+    };
+
   private:
     QString status_; // untranslated
 
@@ -84,6 +97,7 @@
     QString             type;
     QString             multiarch;
     QList<Archive>      archives;
+    QList<BindMount>    mounts;
     QList<InstalledApp> installed_apps;
   };
 

=== modified file 'debian/control'
--- debian/control	2017-02-16 14:05:23 +0000
+++ debian/control	2017-02-22 20:19:40 +0000
@@ -73,6 +73,7 @@
 Package: libertine-qt-common
 Architecture: any
 Depends: qml-module-qtquick2,
+         qml-module-qtquick-dialogs,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          ${misc:Depends},
          ${shlibs:Depends}

=== modified file 'libertine/CMakeLists.txt'
--- libertine/CMakeLists.txt	2016-10-07 21:04:06 +0000
+++ libertine/CMakeLists.txt	2017-02-22 20:19:40 +0000
@@ -12,8 +12,6 @@
 )
 
 add_executable(${LIBERTINE_EXE_NAME} ${libertine_SRC})
-target_link_libraries(${LIBERTINE_EXE_NAME} ${LIBERTINE_COMMON} ${LIBERTINE_CORE} Qt5::Core Qt5::Quick Qt5::Gui)
-
-install(DIRECTORY qml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME})
+target_link_libraries(${LIBERTINE_EXE_NAME} ${LIBERTINE_COMMON} Qt5::Core Qt5::Quick Qt5::Gui)
 
 install(TARGETS ${LIBERTINE_EXE_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

=== modified file 'libertine/libertine.cpp'
--- libertine/libertine.cpp	2017-02-08 14:23:49 +0000
+++ libertine/libertine.cpp	2017-02-22 20:19:40 +0000
@@ -21,6 +21,7 @@
 #include "common/ContainerManager.h"
 #include "common/ContainerAppsList.h"
 #include "common/ContainerArchivesList.h"
+#include "common/ContainerBindMountsList.h"
 #include "common/ContainerConfigList.h"
 #include "common/LibertineConfig.h"
 #include "common/PackageOperationDetails.h"
@@ -114,6 +115,7 @@
   containers_ = new ContainerConfigList(config_.data(), this);
   container_apps_ = new ContainerAppsList(containers_, this);
   container_archives_ = new ContainerArchivesList(containers_, this);
+  container_bind_mounts_ = new ContainerBindMountsList(containers_, this);
   package_operation_details_ = new PackageOperationDetails(this);
 
   initialize_view();
@@ -141,6 +143,7 @@
   ctxt->setContextProperty("containerConfigList", containers_);
   ctxt->setContextProperty("containerAppsList", container_apps_);
   ctxt->setContextProperty("containerArchivesList", container_archives_);
+  ctxt->setContextProperty("containerBindMountsList", container_bind_mounts_);
   ctxt->setContextProperty("packageOperationDetails", package_operation_details_);
 
   view_.setSource(QUrl::fromLocalFile(main_qml_source_file_));

=== modified file 'libertine/libertine.h'
--- libertine/libertine.h	2016-10-03 20:30:29 +0000
+++ libertine/libertine.h	2017-02-22 20:19:40 +0000
@@ -30,6 +30,7 @@
 class LibertineConfig;
 class ContainerAppsList;
 class ContainerArchivesList;
+class ContainerBindMountsList;
 class PackageOperationDetails;
 
 
@@ -57,6 +58,7 @@
     ContainerConfigList*            containers_;
     ContainerAppsList*              container_apps_;
     ContainerArchivesList*          container_archives_;
+    ContainerBindMountsList*        container_bind_mounts_;
     PackageOperationDetails*        package_operation_details_;
     QQuickView                      view_;
 };

=== removed directory 'libertine/qml'
=== added file 'qml/common/AddBindMountDialog.qml'
--- qml/common/AddBindMountDialog.qml	1970-01-01 00:00:00 +0000
+++ qml/common/AddBindMountDialog.qml	2017-02-22 20:19:40 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Canonical Ltd
+ *
+ * Libertine is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3, as published by the
+ * Free Software Foundation.
+ *
+ * Libertine is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+import QtQuick.Dialogs 1.0
+
+FileDialog {
+    id: addBindMountDialog
+    title: "Choose directory to bind-mount"
+    selectFolder: true
+    onAccepted: {
+        if (addBindMountDialog.fileUrl) {
+            extraBindMountsView.addBindMount(addBindMountDialog.fileUrl.toString().replace("file:///", "/"))
+        }
+    }
+}

=== added file 'qml/common/ExtraBindMountsView.qml'
--- qml/common/ExtraBindMountsView.qml	1970-01-01 00:00:00 +0000
+++ qml/common/ExtraBindMountsView.qml	2017-02-22 20:19:40 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2017 Canonical Ltd
+ *
+ * Libertine is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3, as published by the
+ * Free Software Foundation.
+ *
+ * Libertine is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import Libertine 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Page {
+    id: extraBindMountsView
+    clip: true
+    header: PageHeader {
+        id: pageHeader
+        title: i18n.tr("Mapped Directories")
+        trailingActionBar.actions: [
+            Action {
+                iconName: "add"
+                text: i18n.tr("add")
+                description: i18n.tr("Add a new bind-mount")
+                onTriggered: {
+                    var fileDialog = Qt.createComponent("AddBindMountDialog.qml").createObject(extraBindMountsView)
+                    fileDialog.open()
+                }
+            }
+        ]
+    }
+    property string currentContainer: ""
+
+    signal error(string description, string details)
+
+    UbuntuListView {
+        id: bindMountsListView
+        anchors {
+            topMargin: pageHeader.height
+            fill: parent
+        }
+        model: containerBindMountsList
+        visible: !containerBindMountsList.empty()
+        delegate: ListItem {
+            Label {
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                }
+                text: path
+                width: parent.width - units.gu(8)
+                elide: Text.ElideMiddle
+            }
+            leadingActions: ListItemActions {
+                actions: [
+                    Action {
+                        iconName: "delete"
+                        text: i18n.tr("remove")
+                        description: i18n.tr("Remove mapped directory")
+                        onTriggered: {
+                            deleteBindMount(path)
+                        }
+                    }
+                ]
+            }
+        }
+    }
+
+     Label {
+        id: emptyLabel
+        anchors.centerIn: parent
+        visible: !bindMountsListView.visible
+        wrapMode: Text.Wrap
+        width: parent.width
+        horizontalAlignment: Text.AlignHCenter
+        text: i18n.tr("No custom bind-mounts have been added to this container.\n" +
+                      "Adding a directory here will allow you to modify its contents within this container.")
+    }
+
+    function deleteBindMount(mount) {
+        var worker = Qt.createComponent("ContainerManager.qml").createObject(mainView)
+        worker.error.connect(packageOperationDetails.error)
+        worker.configureContainer(currentContainer, containerConfigList.getContainerName(currentContainer), ["--bind-mount", "remove", "--mount-path", "\"" + mount + "\""])
+    }
+
+    function addBindMount(mount) {
+        var worker = Qt.createComponent("ContainerManager.qml").createObject(mainView)
+        worker.error.connect(packageOperationDetails.error)
+        worker.configureContainer(currentContainer, containerConfigList.getContainerName(currentContainer), ["--bind-mount", "add", "--mount-path", "\"" + mount + "\""])
+    }
+
+    Component.onCompleted: {
+        containerConfigList.configChanged.connect(reloadMounts)
+    }
+
+    Component.onDestruction: {
+        containerConfigList.configChanged.disconnect(reloadMounts)
+    }
+
+    function reloadMounts() {
+        containerBindMountsList.setContainerBindMounts(currentContainer)
+        bindMountsListView.visible = !containerBindMountsList.empty()
+    }
+}

=== modified file 'qml/common/ManageContainer.qml'
--- qml/common/ManageContainer.qml	2017-02-06 16:35:18 +0000
+++ qml/common/ManageContainer.qml	2017-02-22 20:19:40 +0000
@@ -78,6 +78,15 @@
                 }
             }
 
+            ListItem.SingleValue {
+                text: i18n.tr("Additional bind-mounts")
+                progression: true
+                onClicked: {
+                    containerBindMountsList.setContainerBindMounts(currentContainer)
+                    pageStack.addPageToNextColumn(manageView, Qt.resolvedUrl("ExtraBindMountsView.qml"), {currentContainer: currentContainer})
+                }
+            }
+
             ListItem.Standard {
                 control: Button {
                     id: updateButton

=== modified file 'tests/unit/ContainersConfigTests.cpp'
--- tests/unit/ContainersConfigTests.cpp	2017-02-13 22:18:18 +0000
+++ tests/unit/ContainersConfigTests.cpp	2017-02-22 20:19:40 +0000
@@ -48,6 +48,9 @@
             "archiveName": "ppa:some/archive",
             "archiveStatus": "installed"
           }
+        ],
+        "bindMounts": [
+          "/media/lrp/PEPPER"
         ]
       },
       {
@@ -107,6 +110,9 @@
   ASSERT_EQ(config.containers[0].archives.size(), 1);
   EXPECT_EQ(config.containers[0].archives[0].status, "installed");
   EXPECT_EQ(config.containers[0].archives[0].name, "ppa:some/archive");
+
+  ASSERT_EQ(config.containers[0].mounts.size(), 1);
+  EXPECT_EQ(config.containers[0].mounts[0].path, "/media/lrp/PEPPER");
 }
 
 
@@ -124,6 +130,7 @@
   auto zesty = json["containerList"].toArray()[1].toObject();
   zesty["installedApps"] = QJsonArray();
   zesty["extraArchives"] = QJsonArray();
+  zesty["bindMounts"] = QJsonArray();
   json["containerList"] = QJsonArray{xenial, zesty};
 
   EXPECT_EQ(json, actual);
@@ -141,4 +148,5 @@
   EXPECT_EQ(container.status, "unknown");
   EXPECT_TRUE(container.archives.isEmpty());
   EXPECT_TRUE(container.installed_apps.isEmpty());
+  EXPECT_TRUE(container.mounts.isEmpty());
 }

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2017-02-14 20:26:49 +0000
+++ tools/libertine-container-manager	2017-02-22 20:19:40 +0000
@@ -307,7 +307,7 @@
                 libertine.utils.get_logger().error("Configure bind-mounts called without mount path. See configure --help for usage")
                 sys.exit(1)
 
-            mount_path = args.mount_path.rstrip('/')
+            mount_path = args.mount_path.rstrip('/').strip('"')
 
             # validate bind-mount
             if not mount_path.startswith(os.environ['HOME']) and not mount_path.startswith('/media/%s' % os.environ['USER']):