4 files changed, 2 insertions, 54 deletions
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile
index 6ee6609f..3a589c73 100644
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile
@@ -3,29 +3,17 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- software-properties-common \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  apt-file \
  git-gui \
  git-svn \
  gnat-5 \
  less \
  locales \
- libgmp-dev \
- libmpc-dev \
- libmpfr-dev \
  mc \
  screen \
+ software-properties-common \
  stgit \
  tmux \
- unifdef \
  && apt-get clean \
  && rm -rf \
  /var/lib/apt/lists/* \
@@ -43,4 +31,4 @@ COPY run.sh start.sh /
 
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: ce97ce5f929251c1dd59473d63aa00c0
+# checksum: f54252755ff04b9508233acaee33cd32
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/Dockerfile
deleted file mode 100644
index a7909d59..00000000
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Auto generated from tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in. Do not edit.
-FROM linaro/ci-amd64-tcwg-dev-ubuntu:xenial
-
-COPY 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/*
-# checksum: 3e1c139ac1715b1096130c6e90c55fc9
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh
deleted file mode 120000
index 6e52e4e6..00000000
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../tcwg-base/tcwg-dev/tcwg-x2go/build.sh
-\ No newline at end of file
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/gerrit-branches b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/gerrit-branches
deleted file mode 120000
index 748350c7..00000000
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/gerrit-branches
+++ /dev/null
@@ -1 +0,0 @@
-../../../tcwg-base/tcwg-dev/tcwg-x2go/gerrit-branches
-\ No newline at end of file