diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2017-01-24 09:01:24 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2017-01-24 09:01:24 +0200 |
| commit | 4e8a585b65356b24161b2f9e0af73f0a31c2dbd1 (patch) | |
| tree | 0f54362415f4d8310a5bfe30a5ccd9d914387a59 /utopic-amd64-art | |
| parent | 682988f5d251b2b9dd401c91a831fb139cd8f149 (diff) | |
utopic-amd64-art: use a wrapper to manage jenkins slave ssh public key
Change-Id: I1912e7aa0b6308ae96c06e29006ed0e4addeb7fb
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'utopic-amd64-art')
| -rw-r--r-- | utopic-amd64-art/Dockerfile | 4 | ||||
| -rwxr-xr-x | utopic-amd64-art/build.sh | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/utopic-amd64-art/Dockerfile b/utopic-amd64-art/Dockerfile index ef744f98..4fe6bacc 100644 --- a/utopic-amd64-art/Dockerfile +++ b/utopic-amd64-art/Dockerfile @@ -1,5 +1,7 @@ FROM ubuntu:utopic +COPY setup-sshd /usr/sbin/setup-sshd + RUN dpkg --add-architecture i386 \ && sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ && apt-get update \ @@ -61,4 +63,4 @@ RUN useradd -m -G plugdev buildslave \ && chown -R buildslave:buildslave /home/buildslave/bin EXPOSE 22 -CMD ["/usr/sbin/sshd", "-D"] +ENTRYPOINT ["/usr/sbin/setup-sshd"] diff --git a/utopic-amd64-art/build.sh b/utopic-amd64-art/build.sh index ada0231b..a797cb51 100755 --- a/utopic-amd64-art/build.sh +++ b/utopic-amd64-art/build.sh @@ -2,6 +2,15 @@ set -e +trap cleanup_exit INT TERM EXIT + +cleanup_exit() +{ + rm -f setup-sshd +} + export LANG=C +cp -a ../setup-sshd . + docker build --pull --tag=linaro/$(basename ${PWD}) . |