diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-08-08 08:11:27 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-08-08 08:12:28 +0000 |
| commit | 73b77b454cd0af444e4d079495e0940e0443ef7e (patch) | |
| tree | f8e5eab6957d8a32c30736238af0da0b47900d89 /tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in | |
| parent | 3686dba66c91b1412fc9080a6302e4f489b1ade8 (diff) | |
| parent | dc5451a85c6a44e85e2b2a1142039233c8a7a529 (diff) | |
Merge remote-tracking branch 'origin/tcwg-tested' into tcwg-staging
Change-Id: If732fefe0b5a919c07d95618c002b8e1ddc1786e
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 \ |