diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-01 11:24:45 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-01 11:24:45 +0000 |
| commit | 6c51576a20ed00b6ba7b3407f220862945b10c2f (patch) | |
| tree | d5cf16a87de16ace92d14c6419bc6ec0fb99f20f /xenial-arm64-tcwg-base | |
| parent | 52e9e1e3e6ead2bce0fc49ef824b0b00686f782f (diff) | |
tcwg-build: Generalize new-user.sh to handle passwd entries as argument
.. in preparation to move it to tcwg-base/
Change-Id: I4263bb1b5cde191b85118b5aff4b1773b7ffc1ab
Diffstat (limited to 'xenial-arm64-tcwg-base')
| -rw-r--r-- | xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile | 7 | ||||
| -rw-r--r-- | xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile index 989ef31e..c9750ffa 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile @@ -3,8 +3,9 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial COPY new-user.sh /usr/local/bin/ -RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \ - && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ && mkdir -p /home/tcwg-buildslave/workspace COPY tcwg-buildslave /home/tcwg-buildslave @@ -15,4 +16,4 @@ RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \ && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \ && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/* -# checksum: a9bb4838879761da324a80f74d713b07 +# checksum: bce8eb4d75d9d08883da549d0a4a93c1 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile index a5327736..fb8fc11f 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile @@ -32,9 +32,9 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ # Add current clang for libcxx bots. RUN \ - clang_ver=clang+llvm-5.0.1-aarch64-linux-gnu \ + clang_ver=clang+llvm-6.0.0-aarch64-linux-gnu \ && cd /usr/local \ - && wget --progress=dot:giga http://releases.llvm.org/5.0.1/$clang_ver.tar.xz \ + && wget --progress=dot:giga http://releases.llvm.org/6.0.0/$clang_ver.tar.xz \ && tar xf $clang_ver.tar.xz \ && rm $clang_ver.tar.xz @@ -45,4 +45,4 @@ COPY start.sh . ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: e518582a2a434e66d9c9388c0bd2fa91 +# checksum: 765b3adb1b9e9f5ee905e980c41f2a32 |