aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2017-02-10 10:09:24 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2017-02-10 10:09:24 +0000
commitf457135455ba32e269f705d338042914ad9aef08 (patch)
tree235955de51f62aac9b756ae2a28087e880907a0b
parenta321d56b73954cf486028955032433f5731d497b (diff)
xenial-amd64-tcwg-x2go: Prepare to rebase on xenial-amd64-tcwg-dev
Change-Id: I5d35ca0e2f6a2e19eac9e9e096d52c3f1d790fa3
-rw-r--r--xenial-amd64-tcwg-x2go/Dockerfile52
1 files changed, 35 insertions, 17 deletions
diff --git a/xenial-amd64-tcwg-x2go/Dockerfile b/xenial-amd64-tcwg-x2go/Dockerfile
index 73fd6b7..1d167e9 100644
--- a/xenial-amd64-tcwg-x2go/Dockerfile
+++ b/xenial-amd64-tcwg-x2go/Dockerfile
@@ -66,22 +66,6 @@ RUN apt-get update \
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
software-properties-common \
- ubuntu-desktop \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN add-apt-repository ppa:x2go/stable \
- && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- duplicity \
- mate-desktop-environment \
- x2godesktopsharing \
- x2gomatebindings \
- x2goserver \
- x2goserver-xsession \
&& apt-get clean \
&& rm -rf \
/var/lib/apt/lists/* \
@@ -91,7 +75,6 @@ RUN add-apt-repository ppa:x2go/stable \
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
apt-file \
- ddd \
git-gui \
git-review \
git-svn \
@@ -133,3 +116,38 @@ COPY run.sh /run.sh
ENTRYPOINT ["/run.sh"]
COPY start.sh /start.sh
+
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ ubuntu-desktop \
+ && apt-get clean \
+ && rm -rf \
+ /var/lib/apt/lists/* \
+ /tmp/* \
+ /var/tmp/*
+
+RUN add-apt-repository ppa:x2go/stable \
+ && apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ duplicity \
+ mate-desktop-environment \
+ x2godesktopsharing \
+ x2gomatebindings \
+ x2goserver \
+ x2goserver-xsession \
+ && apt-get clean \
+ && rm -rf \
+ /var/lib/apt/lists/* \
+ /tmp/* \
+ /var/tmp/*
+
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ ddd \
+ && apt-get clean \
+ && rm -rf \
+ /var/lib/apt/lists/* \
+ /tmp/* \
+ /var/tmp/*
+
+COPY start.sh /start.sh