diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-08-10 16:42:06 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-08-10 16:42:13 +0000 |
| commit | 6e3975d175a8b395efef4d374fa3c963c497fc40 (patch) | |
| tree | 6fae5326868ad6d456ec9d2891ddd300419c2764 /tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in | |
| parent | 0d3d218cb7820c85f4f4bc2289dae04f05846eb6 (diff) | |
| parent | 4987643128451853122837b70d5797400ff45a65 (diff) | |
Merge commit '4987643128451853122837b70d5797400ff45a65' into tcwg-llvmprod
Change-Id: I4843c9c752c139339aff8cb744742769bf327bf2
Diffstat (limited to 'tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in')
| -rw-r--r-- | tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in b/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in index 888e48b8..5191918a 100644 --- a/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in +++ b/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in @@ -11,13 +11,19 @@ RUN apt-get update \ /tmp/* \ /var/tmp/* +#if DISTRO_xenial RUN add-apt-repository ppa:x2go/stable \ +#else +RUN true \ +#endif && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ duplicity \ mate-desktop-environment \ +#if DISTRO_xenial x2godesktopsharing \ x2gomatebindings \ +#endif x2goserver \ x2goserver-xsession \ && apt-get clean \ |