diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2016-02-23 15:25:32 +0200 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2016-02-23 15:30:47 +0200 |
commit | 161841821b355849b4b76e6b873f3bbd5a5ba1ae (patch) | |
tree | 7c27b0dfcd55ed440f0978fd9877b9de0cbda42d | |
parent | 736f45443a721777837e3098e98ae496b469cbfc (diff) |
expose SSH port
With newer docker version 1.10.x, it becomes mandatory.
It was implicit with older images.
Change-Id: Ia06a35c5fabfda089571d53f24650bda9754cebf
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rw-r--r-- | centos7-aarch64-openjdk/Dockerfile | 5 | ||||
-rw-r--r-- | centos7-aarch64/Dockerfile | 6 | ||||
-rw-r--r-- | fedora23-aarch64-openjdk/Dockerfile | 5 | ||||
-rw-r--r-- | fedora23-aarch64/Dockerfile | 6 | ||||
-rw-r--r-- | jessie-arm64/Dockerfile | 6 | ||||
-rw-r--r-- | jessie-armhf/Dockerfile | 6 | ||||
-rw-r--r-- | trusty-amd64-tcwg/Dockerfile | 6 | ||||
-rw-r--r-- | trusty-arm64-openjdk/Dockerfile | 6 | ||||
-rw-r--r-- | trusty-i386-tcwg/Dockerfile | 6 | ||||
-rw-r--r-- | utopic-amd64-art/Dockerfile | 6 | ||||
-rw-r--r-- | wily-amd64-tcwg/Dockerfile | 6 | ||||
-rw-r--r-- | wily-amd64/Dockerfile | 6 | ||||
-rw-r--r-- | wily-arm64/Dockerfile | 6 | ||||
-rw-r--r-- | wily-armhf/Dockerfile | 6 |
14 files changed, 54 insertions, 28 deletions
diff --git a/centos7-aarch64-openjdk/Dockerfile b/centos7-aarch64-openjdk/Dockerfile index f0aa1389..29265b3b 100644 --- a/centos7-aarch64-openjdk/Dockerfile +++ b/centos7-aarch64-openjdk/Dockerfile @@ -16,6 +16,7 @@ RUN useradd -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX6Q9 && echo 'Defaults:buildslave !requiretty' >> /etc/sudoers.d/jenkins \ && chmod 0440 /etc/sudoers.d/jenkins \ && mkdir -p /var/run/sshd \ - && /usr/sbin/sshd-keygen \ - && /usr/sbin/sshd + && /usr/sbin/sshd-keygen +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/centos7-aarch64/Dockerfile b/centos7-aarch64/Dockerfile index 2f1d1aa9..1ca4445f 100644 --- a/centos7-aarch64/Dockerfile +++ b/centos7-aarch64/Dockerfile @@ -12,5 +12,7 @@ RUN useradd -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX6Q9 && echo 'buildslave ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 0440 /etc/sudoers.d/jenkins \ && mkdir -p /var/run/sshd \ - && /usr/sbin/sshd-keygen \ - && /usr/sbin/sshd + && /usr/sbin/sshd-keygen + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/fedora23-aarch64-openjdk/Dockerfile b/fedora23-aarch64-openjdk/Dockerfile index f4f2f022..1a063850 100644 --- a/fedora23-aarch64-openjdk/Dockerfile +++ b/fedora23-aarch64-openjdk/Dockerfile @@ -14,6 +14,7 @@ RUN useradd -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX6Q9 && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 0440 /etc/sudoers.d/jenkins \ && mkdir -p /var/run/sshd \ - && /usr/sbin/sshd-keygen \ - && /usr/sbin/sshd + && /usr/sbin/sshd-keygen +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/fedora23-aarch64/Dockerfile b/fedora23-aarch64/Dockerfile index 5deb43ea..aa09f302 100644 --- a/fedora23-aarch64/Dockerfile +++ b/fedora23-aarch64/Dockerfile @@ -11,5 +11,7 @@ RUN useradd -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX6Q9 && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 0440 /etc/sudoers.d/jenkins \ && mkdir -p /var/run/sshd \ - && /usr/sbin/sshd-keygen \ - && /usr/sbin/sshd + && /usr/sbin/sshd-keygen + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/jessie-arm64/Dockerfile b/jessie-arm64/Dockerfile index 2f1a73eb..3f1ee222 100644 --- a/jessie-arm64/Dockerfile +++ b/jessie-arm64/Dockerfile @@ -54,5 +54,7 @@ RUN apt-key add /etc/apt/sources.list.d/*.key \ RUN useradd -m -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX6Q9PYhdV/CyJg7uthSIqIyzlNF65NVB1xwGtt0/' buildslave \ && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 440 /etc/sudoers.d/jenkins \ - && mkdir -p /var/run/sshd \ - && /usr/sbin/sshd + && mkdir -p /var/run/sshd + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/jessie-armhf/Dockerfile b/jessie-armhf/Dockerfile index 7d5ebe1a..b530e029 100644 --- a/jessie-armhf/Dockerfile +++ b/jessie-armhf/Dockerfile @@ -54,5 +54,7 @@ RUN apt-key add /etc/apt/sources.list.d/*.key \ RUN useradd -m -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX6Q9PYhdV/CyJg7uthSIqIyzlNF65NVB1xwGtt0/' buildslave \ && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 440 /etc/sudoers.d/jenkins \ - && mkdir -p /var/run/sshd \ - && /usr/sbin/sshd + && mkdir -p /var/run/sshd + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/trusty-amd64-tcwg/Dockerfile b/trusty-amd64-tcwg/Dockerfile index 157c0d06..929f981c 100644 --- a/trusty-amd64-tcwg/Dockerfile +++ b/trusty-amd64-tcwg/Dockerfile @@ -67,6 +67,8 @@ RUN groupadd -g 9000 tcwg-infra \ && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 440 /etc/sudoers.d/jenkins \ && echo 'PATH="/opt/lsb/bin:$PATH"' >> /home/tcwg-buildslave/.profile \ - && mkdir -p /var/run/sshd \ && install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \ - && /usr/sbin/sshd + && mkdir -p /var/run/sshd + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/trusty-arm64-openjdk/Dockerfile b/trusty-arm64-openjdk/Dockerfile index 6e9530cc..ed0baa2b 100644 --- a/trusty-arm64-openjdk/Dockerfile +++ b/trusty-arm64-openjdk/Dockerfile @@ -20,5 +20,7 @@ RUN echo 'deb http://ports.ubuntu.com/ubuntu-ports trusty main universe' > /etc/ RUN useradd -m -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX6Q9PYhdV/CyJg7uthSIqIyzlNF65NVB1xwGtt0/' buildslave \ && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 0440 /etc/sudoers.d/jenkins \ - && mkdir -p /var/run/sshd \ - && /usr/sbin/sshd + && mkdir -p /var/run/sshd + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/trusty-i386-tcwg/Dockerfile b/trusty-i386-tcwg/Dockerfile index c92a6914..63771a4a 100644 --- a/trusty-i386-tcwg/Dockerfile +++ b/trusty-i386-tcwg/Dockerfile @@ -68,6 +68,8 @@ RUN groupadd -g 9000 tcwg-infra \ && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 440 /etc/sudoers.d/jenkins \ && echo 'PATH="/opt/lsb/bin:$PATH"' >> /home/tcwg-buildslave/.profile \ - && mkdir -p /var/run/sshd \ && install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \ - && /usr/sbin/sshd + && mkdir -p /var/run/sshd + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/utopic-amd64-art/Dockerfile b/utopic-amd64-art/Dockerfile index 8a24e450..04d371c9 100644 --- a/utopic-amd64-art/Dockerfile +++ b/utopic-amd64-art/Dockerfile @@ -58,5 +58,7 @@ RUN useradd -m -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX && curl https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py > /home/buildslave/bin/cpplint.py \ && curl https://storage.googleapis.com/git-repo-downloads/repo > /home/buildslave/bin/repo \ && chmod a+x /home/buildslave/bin/* \ - && chown -R buildslave:buildslave /home/buildslave/bin \ - && /usr/sbin/sshd + && chown -R buildslave:buildslave /home/buildslave/bin + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/wily-amd64-tcwg/Dockerfile b/wily-amd64-tcwg/Dockerfile index 36b617ea..22e05e73 100644 --- a/wily-amd64-tcwg/Dockerfile +++ b/wily-amd64-tcwg/Dockerfile @@ -67,6 +67,8 @@ RUN groupadd -g 9000 tcwg-infra \ && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 440 /etc/sudoers.d/jenkins \ && echo 'PATH="/opt/lsb/bin:$PATH"' >> /home/tcwg-buildslave/.profile \ - && mkdir -p /var/run/sshd \ && install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \ - && /usr/sbin/sshd + && mkdir -p /var/run/sshd + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/wily-amd64/Dockerfile b/wily-amd64/Dockerfile index 00059412..bbb689c6 100644 --- a/wily-amd64/Dockerfile +++ b/wily-amd64/Dockerfile @@ -64,5 +64,7 @@ RUN dpkg --add-architecture i386 \ RUN useradd -m -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX6Q9PYhdV/CyJg7uthSIqIyzlNF65NVB1xwGtt0/' buildslave \ && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 440 /etc/sudoers.d/jenkins \ - && mkdir -p /var/run/sshd \ - && /usr/sbin/sshd + && mkdir -p /var/run/sshd + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/wily-arm64/Dockerfile b/wily-arm64/Dockerfile index 4a96ff59..e2afcb16 100644 --- a/wily-arm64/Dockerfile +++ b/wily-arm64/Dockerfile @@ -55,5 +55,7 @@ RUN echo 'deb http://ports.ubuntu.com/ubuntu-ports wily main universe' > /etc/ap RUN useradd -m -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX6Q9PYhdV/CyJg7uthSIqIyzlNF65NVB1xwGtt0/' buildslave \ && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 440 /etc/sudoers.d/jenkins \ - && mkdir -p /var/run/sshd \ - && /usr/sbin/sshd + && mkdir -p /var/run/sshd + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/wily-armhf/Dockerfile b/wily-armhf/Dockerfile index ff270bc0..e8033ee3 100644 --- a/wily-armhf/Dockerfile +++ b/wily-armhf/Dockerfile @@ -55,5 +55,7 @@ RUN echo 'deb http://ports.ubuntu.com/ubuntu-ports wily main universe' > /etc/ap RUN useradd -m -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX6Q9PYhdV/CyJg7uthSIqIyzlNF65NVB1xwGtt0/' buildslave \ && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ && chmod 440 /etc/sudoers.d/jenkins \ - && mkdir -p /var/run/sshd \ - && /usr/sbin/sshd + && mkdir -p /var/run/sshd + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] |