aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tcwg-base/home-data/passwd (renamed from tcwg-base/tcwg-host/passwd)0
-rw-r--r--tcwg-base/tcwg-build/Dockerfile.in11
-rwxr-xr-xtcwg-base/tcwg-build/build.sh5
-rw-r--r--tcwg-base/tcwg-host/Dockerfile.in10
-rwxr-xr-xtcwg-base/tcwg-host/build.sh3
-rw-r--r--trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile13
-rw-r--r--trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile13
-rw-r--r--trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile13
-rw-r--r--trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile13
-rw-r--r--xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile13
-rw-r--r--xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile12
-rw-r--r--xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile13
-rw-r--r--xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile12
-rw-r--r--xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile13
-rw-r--r--xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile13
15 files changed, 94 insertions, 63 deletions
diff --git a/tcwg-base/tcwg-host/passwd b/tcwg-base/home-data/passwd
index c63d1163..c63d1163 100644
--- a/tcwg-base/tcwg-host/passwd
+++ b/tcwg-base/home-data/passwd
diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in
index 2af68b2c..74b0ccd3 100644
--- a/tcwg-base/tcwg-build/Dockerfile.in
+++ b/tcwg-base/tcwg-build/Dockerfile.in
@@ -1,11 +1,14 @@
FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO}
-COPY tcwg-buildslave /home-data/tcwg-buildslave
-COPY tcwg-benchmark /home-data/tcwg-benchmark
+COPY home-data/ /home-data/
RUN new-user.sh --group tcwg-infra:9000 \
- && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \
- && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \
+ && while read line; do \
+ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+ continue; \
+ fi; \
+ new-user.sh --passwd "$line" --home-data /home-data; \
+ done </home-data/passwd \
&& rm -rf /home-data/ \
&& mkdir -p /home/tcwg-buildslave/workspace
diff --git a/tcwg-base/tcwg-build/build.sh b/tcwg-base/tcwg-build/build.sh
index 2cc96d04..35d0b44a 100755
--- a/tcwg-base/tcwg-build/build.sh
+++ b/tcwg-base/tcwg-build/build.sh
@@ -6,7 +6,7 @@ trap cleanup_exit INT TERM EXIT
cleanup_exit()
{
- rm -rf tcwg-buildslave tcwg-benchmark
+ rm -rf home-data/
}
export LANG=C
@@ -16,8 +16,7 @@ name=$(basename ${PWD} | cut -f3- -d '-')
image=linaro/ci-${arch}-${name}-ubuntu:${distro}
top=$(git rev-parse --show-toplevel)
-rsync -aL $top/tcwg-base/home-data/tcwg-buildslave/ ./tcwg-buildslave/
-rsync -aL $top/tcwg-base/home-data/tcwg-benchmark/ ./tcwg-benchmark/
+rsync -aL $top/tcwg-base/home-data/ ./home-data/
(cd ..; ./build.sh)
"$top"/tcwg-base/validate-dockerfile.sh Dockerfile
diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in
index 94d45a1e..5f8e5123 100644
--- a/tcwg-base/tcwg-host/Dockerfile.in
+++ b/tcwg-base/tcwg-host/Dockerfile.in
@@ -1,10 +1,12 @@
FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO}
-COPY passwd start.sh /
COPY home-data/ /home-data/
-RUN new-user.sh --group tcwg-infra:9000 && new-user.sh --group tcwg-users:10000 \
+RUN new-user.sh --group tcwg-infra:9000 \
+ && new-user.sh --group tcwg-users:10000 \
&& while read line; do \
new-user.sh --passwd "$line" --home-data /home-data; \
- done </passwd \
- && rm -rf /passwd /home-data/
+ done </home-data/passwd \
+ && rm -rf /home-data/
+
+COPY start.sh /
diff --git a/tcwg-base/tcwg-host/build.sh b/tcwg-base/tcwg-host/build.sh
index 7cbf775f..33dbb50e 100755
--- a/tcwg-base/tcwg-host/build.sh
+++ b/tcwg-base/tcwg-host/build.sh
@@ -6,7 +6,7 @@ trap cleanup_exit INT TERM EXIT
cleanup_exit()
{
- rm -rf home-data/ passwd start.sh
+ rm -rf home-data/ start.sh
}
export LANG=C
@@ -17,7 +17,6 @@ image=linaro/ci-${arch}-${name}-ubuntu:${distro}
top=$(git rev-parse --show-toplevel)
rsync -aL $top/tcwg-base/home-data/ ./home-data/
-cp $top/tcwg-base/tcwg-host/passwd ./
cp $top/tcwg-base/tcwg-host/start.sh ./
(cd ..; ./build.sh)
diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile
index 093f8c33..3ee0f7f2 100644
--- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile
+++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile
@@ -1,12 +1,15 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-amd64-tcwg-base-ubuntu:trusty
-COPY tcwg-buildslave /home-data/tcwg-buildslave
-COPY tcwg-benchmark /home-data/tcwg-benchmark
+COPY home-data/ /home-data/
RUN new-user.sh --group tcwg-infra:9000 \
- && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \
- && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \
+ && while read line; do \
+ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+ continue; \
+ fi; \
+ new-user.sh --passwd "$line" --home-data /home-data; \
+ done </home-data/passwd \
&& rm -rf /home-data/ \
&& mkdir -p /home/tcwg-buildslave/workspace
@@ -22,4 +25,4 @@ RUN \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/*
-# checksum: 597468c184f0538f41715771c44d58cf
+# checksum: b02ce80a831ba2676f9faa5591dfa4ab
diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile
index ea5ee9fa..bc464280 100644
--- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile
+++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile
@@ -1,13 +1,16 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-arm64-tcwg-base-ubuntu:trusty
-COPY tcwg-buildslave /home-data/tcwg-buildslave
-COPY tcwg-benchmark /home-data/tcwg-benchmark
+COPY home-data/ /home-data/
RUN new-user.sh --group tcwg-infra:9000 \
- && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \
- && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \
+ && while read line; do \
+ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+ continue; \
+ fi; \
+ new-user.sh --passwd "$line" --home-data /home-data; \
+ done </home-data/passwd \
&& rm -rf /home-data/ \
&& mkdir -p /home/tcwg-buildslave/workspace
-# checksum: 1f4929624403ba0098b195d9e5fdcf9e
+# checksum: 2f4e3dede3a0934235e0559faef5e16f
diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile
index 2f3de526..32868a4f 100644
--- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile
+++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile
@@ -1,13 +1,16 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-armhf-tcwg-base-ubuntu:trusty
-COPY tcwg-buildslave /home-data/tcwg-buildslave
-COPY tcwg-benchmark /home-data/tcwg-benchmark
+COPY home-data/ /home-data/
RUN new-user.sh --group tcwg-infra:9000 \
- && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \
- && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \
+ && while read line; do \
+ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+ continue; \
+ fi; \
+ new-user.sh --passwd "$line" --home-data /home-data; \
+ done </home-data/passwd \
&& rm -rf /home-data/ \
&& mkdir -p /home/tcwg-buildslave/workspace
-# checksum: db0e3193be6949bae8fe11a6b4734a51
+# checksum: bc6ce51c65faa9c1fae5d7a4c8377ecd
diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
index 36e4717c..219c1b0f 100644
--- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
+++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
@@ -1,12 +1,15 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-i386-tcwg-base-ubuntu:trusty
-COPY tcwg-buildslave /home-data/tcwg-buildslave
-COPY tcwg-benchmark /home-data/tcwg-benchmark
+COPY home-data/ /home-data/
RUN new-user.sh --group tcwg-infra:9000 \
- && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \
- && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \
+ && while read line; do \
+ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+ continue; \
+ fi; \
+ new-user.sh --passwd "$line" --home-data /home-data; \
+ done </home-data/passwd \
&& rm -rf /home-data/ \
&& mkdir -p /home/tcwg-buildslave/workspace
@@ -21,4 +24,4 @@ RUN \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/*
-# checksum: becea34147b660bbfa87d5076b3864d5
+# checksum: 6ae2ef755b8341632f2fadacc0e5eaf0
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
index e8f026c0..243f8dd8 100644
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
@@ -1,12 +1,15 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial
-COPY tcwg-buildslave /home-data/tcwg-buildslave
-COPY tcwg-benchmark /home-data/tcwg-benchmark
+COPY home-data/ /home-data/
RUN new-user.sh --group tcwg-infra:9000 \
- && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \
- && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \
+ && while read line; do \
+ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+ continue; \
+ fi; \
+ new-user.sh --passwd "$line" --home-data /home-data; \
+ done </home-data/passwd \
&& rm -rf /home-data/ \
&& mkdir -p /home/tcwg-buildslave/workspace
@@ -22,4 +25,4 @@ RUN \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/*
-# checksum: 32efda3903352f4752d6cbc26a1666b6
+# checksum: a2d23a94f01da5685104bed8b80b8333
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile
index 2474158c..6c6396f2 100644
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile
@@ -1,12 +1,14 @@
# Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit.
FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial
-COPY passwd start.sh /
COPY home-data/ /home-data/
-RUN new-user.sh --group tcwg-infra:9000 && new-user.sh --group tcwg-users:10000 \
+RUN new-user.sh --group tcwg-infra:9000 \
+ && new-user.sh --group tcwg-users:10000 \
&& while read line; do \
new-user.sh --passwd "$line" --home-data /home-data; \
- done </passwd \
- && rm -rf /passwd /home-data/
-# checksum: e22424698f84f6b617398c9d79f141ed
+ done </home-data/passwd \
+ && rm -rf /home-data/
+
+COPY start.sh /
+# checksum: 4edc5b546637a06c2a7872e8c910663f
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
index c8405b72..ec5854d2 100644
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
@@ -1,13 +1,16 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial
-COPY tcwg-buildslave /home-data/tcwg-buildslave
-COPY tcwg-benchmark /home-data/tcwg-benchmark
+COPY home-data/ /home-data/
RUN new-user.sh --group tcwg-infra:9000 \
- && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \
- && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \
+ && while read line; do \
+ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+ continue; \
+ fi; \
+ new-user.sh --passwd "$line" --home-data /home-data; \
+ done </home-data/passwd \
&& rm -rf /home-data/ \
&& mkdir -p /home/tcwg-buildslave/workspace
-# checksum: c416a53e9a9b892d7de3e78c70a02858
+# checksum: d4cc5ee96189482489c8b68ac4ea5f2e
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile
index 289f7613..862d96c7 100644
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile
@@ -1,12 +1,14 @@
# Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit.
FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial
-COPY passwd start.sh /
COPY home-data/ /home-data/
-RUN new-user.sh --group tcwg-infra:9000 && new-user.sh --group tcwg-users:10000 \
+RUN new-user.sh --group tcwg-infra:9000 \
+ && new-user.sh --group tcwg-users:10000 \
&& while read line; do \
new-user.sh --passwd "$line" --home-data /home-data; \
- done </passwd \
- && rm -rf /passwd /home-data/
-# checksum: ec94afcaca03b088611a5457c8d37222
+ done </home-data/passwd \
+ && rm -rf /home-data/
+
+COPY start.sh /
+# checksum: 8310168236ead50fc804ff746fb423d3
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile
index 7d890cc7..260e311f 100644
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile
@@ -1,13 +1,16 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-armhf-tcwg-base-ubuntu:xenial
-COPY tcwg-buildslave /home-data/tcwg-buildslave
-COPY tcwg-benchmark /home-data/tcwg-benchmark
+COPY home-data/ /home-data/
RUN new-user.sh --group tcwg-infra:9000 \
- && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \
- && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \
+ && while read line; do \
+ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+ continue; \
+ fi; \
+ new-user.sh --passwd "$line" --home-data /home-data; \
+ done </home-data/passwd \
&& rm -rf /home-data/ \
&& mkdir -p /home/tcwg-buildslave/workspace
-# checksum: fbf6f8e32515f6bf9650f47e5c9f744b
+# checksum: ca85feb4461f9dc3362608076a79ac5f
diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
index 8cbd2206..92001b47 100644
--- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
+++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
@@ -1,12 +1,15 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-i386-tcwg-base-ubuntu:xenial
-COPY tcwg-buildslave /home-data/tcwg-buildslave
-COPY tcwg-benchmark /home-data/tcwg-benchmark
+COPY home-data/ /home-data/
RUN new-user.sh --group tcwg-infra:9000 \
- && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \
- && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \
+ && while read line; do \
+ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+ continue; \
+ fi; \
+ new-user.sh --passwd "$line" --home-data /home-data; \
+ done </home-data/passwd \
&& rm -rf /home-data/ \
&& mkdir -p /home/tcwg-buildslave/workspace
@@ -21,4 +24,4 @@ RUN \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/*
-# checksum: 2e55087ee50a83f6114714601050b037
+# checksum: 951d01a420d9f6a21986c800030954b6
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 21:05:24 +0000