aboutsummaryrefslogtreecommitdiff
path: root/xenial-arm64-tcwg-base
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2018-06-01 11:29:39 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2018-06-01 11:29:39 +0000
commitbd4718155732038844245da6cafd017a2464e580 (patch)
tree3f38b21395ddbabdd524d1fd50e78f59973b33ff /xenial-arm64-tcwg-base
parent6c51576a20ed00b6ba7b3407f220862945b10c2f (diff)
tcwg-base/: Move new-user.sh here from tcwg-build/
Change-Id: Idd91d3b71b1980958895bb3e5a0c4a814bb1ed09
Diffstat (limited to 'xenial-arm64-tcwg-base')
-rw-r--r--xenial-arm64-tcwg-base/Dockerfile3
-rw-r--r--xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile4
2 files changed, 3 insertions, 4 deletions
diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile
index 74a08245..6ccee341 100644
--- a/xenial-arm64-tcwg-base/Dockerfile
+++ b/xenial-arm64-tcwg-base/Dockerfile
@@ -95,6 +95,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
@@ -110,4 +111,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: bb32f5a03bcc7864035ebc495cde2ea4
+# checksum: eb5050cf6f8ba0bc4eb41dff0da50073
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
index c9750ffa..19b01205 100644
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
@@ -1,8 +1,6 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial
-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: bce8eb4d75d9d08883da549d0a4a93c1
+# checksum: 3fe6459b89aac3f2b3935eb472339a56