Loading .gitlab/ci/containers/base/Containerfile +17 −8 Original line number Diff line number Diff line Loading @@ -22,18 +22,27 @@ RUN cd tor-browser && \ yes | MOZBUILD_STATE_PATH=/var/tmp/mozbuild ./mach bootstrap --application-choice "$APPLICATION_CHOICE" && \ cd .. ENV PATH="/var/tmp/mozbuild/clang/bin:/root/.cargo/bin:$PATH" RUN rm -rf tor-browser && \ rm -rf /var/lib/apt/lists/* && \ apt-get clean && \ rm -rf /var/tmp/mozbuild/toolchains && \ rm -rf /var/tmp/mozbuild/indices && \ rm -rf /var/tmp/mozbuild/android-device && \ rm -rf /var/root/.cargo && \ rm -rf /var/root/.rustup RUN adduser --uid 1000 --disabled-password --gecos "" gitlab-runner && \ chown -R 1000:1000 /var/tmp/mozbuild/ USER gitlab-runner WORKDIR /home/gitlab-runner # Install Rust for the gitlab-runner user. RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ENV PATH="/var/tmp/mozbuild/clang/bin:/home/gitlab-runner/.cargo/bin:$PATH" RUN echo "$APPLICATION_CHOICE" | grep -qi android && \ rustup target add armv7-linux-androideabi \ aarch64-linux-android \ i686-linux-android \ x86_64-linux-android \ || true RUN rm -rf tor-browser && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/tmp/mozbuild/toolchains && \ rm -rf /var/tmp/mozbuild/indices && \ rm -rf /var/tmp/mozbuild/android-device Loading
.gitlab/ci/containers/base/Containerfile +17 −8 Original line number Diff line number Diff line Loading @@ -22,18 +22,27 @@ RUN cd tor-browser && \ yes | MOZBUILD_STATE_PATH=/var/tmp/mozbuild ./mach bootstrap --application-choice "$APPLICATION_CHOICE" && \ cd .. ENV PATH="/var/tmp/mozbuild/clang/bin:/root/.cargo/bin:$PATH" RUN rm -rf tor-browser && \ rm -rf /var/lib/apt/lists/* && \ apt-get clean && \ rm -rf /var/tmp/mozbuild/toolchains && \ rm -rf /var/tmp/mozbuild/indices && \ rm -rf /var/tmp/mozbuild/android-device && \ rm -rf /var/root/.cargo && \ rm -rf /var/root/.rustup RUN adduser --uid 1000 --disabled-password --gecos "" gitlab-runner && \ chown -R 1000:1000 /var/tmp/mozbuild/ USER gitlab-runner WORKDIR /home/gitlab-runner # Install Rust for the gitlab-runner user. RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ENV PATH="/var/tmp/mozbuild/clang/bin:/home/gitlab-runner/.cargo/bin:$PATH" RUN echo "$APPLICATION_CHOICE" | grep -qi android && \ rustup target add armv7-linux-androideabi \ aarch64-linux-android \ i686-linux-android \ x86_64-linux-android \ || true RUN rm -rf tor-browser && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/tmp/mozbuild/toolchains && \ rm -rf /var/tmp/mozbuild/indices && \ rm -rf /var/tmp/mozbuild/android-device