diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-01 11:29:39 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-01 11:29:39 +0000 |
| commit | bd4718155732038844245da6cafd017a2464e580 (patch) | |
| tree | 3f38b21395ddbabdd524d1fd50e78f59973b33ff /trusty-armhf-tcwg-base | |
| parent | 6c51576a20ed00b6ba7b3407f220862945b10c2f (diff) | |
tcwg-base/: Move new-user.sh here from tcwg-build/
Change-Id: Idd91d3b71b1980958895bb3e5a0c4a814bb1ed09
Diffstat (limited to 'trusty-armhf-tcwg-base')
| -rw-r--r-- | trusty-armhf-tcwg-base/Dockerfile | 3 | ||||
| -rw-r--r-- | trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/trusty-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile index 4441771d..63d1e6e1 100644 --- a/trusty-armhf-tcwg-base/Dockerfile +++ b/trusty-armhf-tcwg-base/Dockerfile @@ -94,6 +94,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config +COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -109,4 +110,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: a86a75795b6252fa520a5d910dd3697f +# checksum: 47776efeb9b9a4f08e738296b8011574 diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile index c604beac..671f0265 100644 --- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile +++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile @@ -1,8 +1,6 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-armhf-tcwg-base-ubuntu:trusty -COPY new-user.sh /usr/local/bin/ - 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" \ @@ -16,4 +14,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: e51d292a6d912955404de2b0be008b82 +# checksum: b6038e0cfa2fdbc2b1e25fc33bc26cde |