diff options
9 files changed, 17 insertions, 26 deletions
diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in index 74b0ccd3..9444dedf 100644 --- a/tcwg-base/tcwg-build/Dockerfile.in +++ b/tcwg-base/tcwg-build/Dockerfile.in @@ -9,8 +9,7 @@ RUN new-user.sh --group tcwg-infra:9000 \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ done </home-data/passwd \ - && rm -rf /home-data/ \ - && mkdir -p /home/tcwg-buildslave/workspace + && rm -rf /home-data/ #if ARCH_amd64 || ARCH_i386 # Install wine. On amd64 arch we need to enable i386, otherwise wine diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile index 3ee0f7f2..8cf7cf37 100644 --- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile +++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile @@ -10,8 +10,7 @@ RUN new-user.sh --group tcwg-infra:9000 \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ done </home-data/passwd \ - && rm -rf /home-data/ \ - && mkdir -p /home/tcwg-buildslave/workspace + && rm -rf /home-data/ # Install wine. On amd64 arch we need to enable i386, otherwise wine # won't meet dependencies (this is the case at least for trusty and xenial). @@ -25,4 +24,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: b02ce80a831ba2676f9faa5591dfa4ab +# checksum: 617dc5ba35fb1d2d5e93b8e1c3e9e669 diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile index bc464280..fe6ca55b 100644 --- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile +++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile @@ -10,7 +10,6 @@ RUN new-user.sh --group tcwg-infra:9000 \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ done </home-data/passwd \ - && rm -rf /home-data/ \ - && mkdir -p /home/tcwg-buildslave/workspace + && rm -rf /home-data/ -# checksum: 2f4e3dede3a0934235e0559faef5e16f +# checksum: b5c4d30033196c27d86f63c5ad8a2e45 diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile index 32868a4f..3ad09aca 100644 --- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile +++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile @@ -10,7 +10,6 @@ RUN new-user.sh --group tcwg-infra:9000 \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ done </home-data/passwd \ - && rm -rf /home-data/ \ - && mkdir -p /home/tcwg-buildslave/workspace + && rm -rf /home-data/ -# checksum: bc6ce51c65faa9c1fae5d7a4c8377ecd +# checksum: a71bd21690ec22f250dd6652fbefcb3c diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile index 219c1b0f..82a990af 100644 --- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile +++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile @@ -10,8 +10,7 @@ RUN new-user.sh --group tcwg-infra:9000 \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ done </home-data/passwd \ - && rm -rf /home-data/ \ - && mkdir -p /home/tcwg-buildslave/workspace + && rm -rf /home-data/ # Install wine. On amd64 arch we need to enable i386, otherwise wine # won't meet dependencies (this is the case at least for trusty and xenial). @@ -24,4 +23,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 6ae2ef755b8341632f2fadacc0e5eaf0 +# checksum: 15e8b16ded4fbd3a0f8395195664b61f diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile index 243f8dd8..ab027d2b 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile @@ -10,8 +10,7 @@ RUN new-user.sh --group tcwg-infra:9000 \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ done </home-data/passwd \ - && rm -rf /home-data/ \ - && mkdir -p /home/tcwg-buildslave/workspace + && rm -rf /home-data/ # Install wine. On amd64 arch we need to enable i386, otherwise wine # won't meet dependencies (this is the case at least for trusty and xenial). @@ -25,4 +24,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: a2d23a94f01da5685104bed8b80b8333 +# checksum: 396ee316c32bc04ca8db0d76bf4f4948 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile index ec5854d2..e4dde9f2 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile @@ -10,7 +10,6 @@ RUN new-user.sh --group tcwg-infra:9000 \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ done </home-data/passwd \ - && rm -rf /home-data/ \ - && mkdir -p /home/tcwg-buildslave/workspace + && rm -rf /home-data/ -# checksum: d4cc5ee96189482489c8b68ac4ea5f2e +# checksum: 116223258ddae0bfc71c1aef78c673cd diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile index 260e311f..c8fa79c1 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile @@ -10,7 +10,6 @@ RUN new-user.sh --group tcwg-infra:9000 \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ done </home-data/passwd \ - && rm -rf /home-data/ \ - && mkdir -p /home/tcwg-buildslave/workspace + && rm -rf /home-data/ -# checksum: ca85feb4461f9dc3362608076a79ac5f +# checksum: 43e48ac069d20747286d7172a99b0552 diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile index 92001b47..a7126f0e 100644 --- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile +++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile @@ -10,8 +10,7 @@ RUN new-user.sh --group tcwg-infra:9000 \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ done </home-data/passwd \ - && rm -rf /home-data/ \ - && mkdir -p /home/tcwg-buildslave/workspace + && rm -rf /home-data/ # Install wine. On amd64 arch we need to enable i386, otherwise wine # won't meet dependencies (this is the case at least for trusty and xenial). @@ -24,4 +23,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 951d01a420d9f6a21986c800030954b6 +# checksum: f882d18e6d6d594bc1e3affae37e9cf5 |