aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2017-02-10 10:11:01 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2017-02-10 10:11:01 +0000
commita06b1ba496e85207906cfa0c7401a832caf10238 (patch)
tree872f1fab6f083da670cc67e991c4bae388f27a13
parentf457135455ba32e269f705d338042914ad9aef08 (diff)
xenial-amd64-tcwg-x2go: Base on xenial-amd64-tcwg-dev.HEADmaster
Change-Id: I124b0008aad64d80ac1b7995ddfd13179afbc4ee
-rw-r--r--xenial-amd64-tcwg-x2go/Dockerfile119
-rwxr-xr-xxenial-amd64-tcwg-x2go/run.sh35
2 files changed, 1 insertions, 153 deletions
diff --git a/xenial-amd64-tcwg-x2go/Dockerfile b/xenial-amd64-tcwg-x2go/Dockerfile
index 1d167e9..da00585 100644
--- a/xenial-amd64-tcwg-x2go/Dockerfile
+++ b/xenial-amd64-tcwg-x2go/Dockerfile
@@ -1,121 +1,4 @@
-FROM ubuntu:xenial
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y devscripts \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- alien \
- autoconf \
- autogen \
- automake \
- bc \
- bison \
- build-essential \
- ccache \
- ccrypt \
- byacc \
- debhelper \
- dejagnu \
- dh-autoreconf \
- dh-translations \
- distro-info-data \
- docker.io \
- emacs \
- fakeroot \
- flex \
- g++-multilib \
- gawk \
- gdb \
- gdbserver \
- git \
- libexpat1-dev \
- liblzma-dev \
- libncurses5-dev \
- libpython2.7-dev \
- libreadline-dev \
- libssl-dev \
- libtcnative-1 \
- libtool \
- lzop \
- make \
- mingw-w64 \
- net-tools \
- netcat \
- openjdk-8-jdk \
- openssh-server \
- python-dev \
- pxz \
- qemu-user \
- rsync \
- sudo \
- texinfo \
- texlive-fonts-recommended \
- texlive-latex-recommended \
- time \
- vim \
- wget \
- xz-utils \
- zip \
- zlib1g-dev \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-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-review \
- git-svn \
- gnat-5 \
- less \
- libgmp-dev \
- libmpc-dev \
- libmpfr-dev \
- mc \
- screen \
- stgit \
- tmux \
- && apt-get clean \
- && rm -rf \
- /var/lib/apt/lists/* \
- /tmp/* \
- /var/tmp/*
-
-RUN mkdir -p /var/run/sshd \
- && sed -i -e '/.*AuthorizedKeysFile/ d' /etc/ssh/sshd_config \
- && echo "AuthorizedKeysFile %h/.ssh/authorized_keys.docker" >> /etc/ssh/sshd_config \
- && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \
- && apt-file update
-
-# Create directories required for X11.
-RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \
- && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix
-
-# We use ssh multiplexing, which creates sockets in /tmp. Overlayfs,
-# which docker is using, can't host sockets, so we use a scratch mount
-# for /tmp. This requires that we add --rm option to "docker run"
-# invocations (e.g., mark "Remove volumes" checkbox in docker plugin) to
-# cleanup host directories used for the scratch mounts.
-VOLUME /tmp
-
-EXPOSE 22
-
-COPY run.sh /run.sh
-ENTRYPOINT ["/run.sh"]
-
-COPY start.sh /start.sh
+FROM linaro/dev-amd64-tcwg-dev-ubuntu:xenial
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
diff --git a/xenial-amd64-tcwg-x2go/run.sh b/xenial-amd64-tcwg-x2go/run.sh
deleted file mode 100755
index ed6a9b5..0000000
--- a/xenial-amd64-tcwg-x2go/run.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ x"$@" = x"start.sh" ]; then
- cat /start.sh
- exit 0
-fi
-
-if ! [ -f /etc/sudoers.d/user ]; then
- passwd_ent="$1"
- groupname="$2"
- pubkey="$3"
-
- username="$(echo $passwd_ent | cut -d: -f 1)"
- uid="$(echo $passwd_ent | cut -d: -f 3)"
- gid="$(echo $passwd_ent | cut -d: -f 4)"
- comment="$(echo $passwd_ent | cut -d: -f 5)"
- home="$(echo $passwd_ent | cut -d: -f 6)"
- shell="$(echo $passwd_ent | cut -d: -f 7)"
-
- groupadd -g "$gid" "$groupname"
- useradd -m -u "$uid" -g "$groupname" -c "$comment" -s "$shell" "$username"
-
- if ! [ -f /home/$username/.ssh/authorized_keys.docker ] \
- && [ x"$pubkey" != x"" ]; then
- sudo -u $username mkdir -p /home/$username/.ssh/
- echo "$pubkey" | sudo -u $username tee /home/$username/.ssh/authorized_keys.docker > /dev/null
- fi
-
- echo "$username ALL = NOPASSWD: ALL" > /etc/sudoers.d/user
- chmod 440 /etc/sudoers.d/user
-fi
-
-exec /usr/sbin/sshd -D