brizental pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

1 changed file:

Changes:

  • .gitlab/ci/containers/base/Containerfile
    ... ... @@ -3,7 +3,7 @@
    3 3
     # Whenever there are changes to this file,
    
    4 4
     # they are autopublished on merge to the tpo/applications/tor-browser repository.
    
    5 5
     #
    
    6
    -# The image is updated roughly once a monce when the tor-browser repository is rebased.
    
    6
    +# The image is updated roughly once a month when the tor-browser repository is rebased.
    
    7 7
     
    
    8 8
     FROM containers.torproject.org/tpo/tpa/base-images/python:bookworm
    
    9 9
     
    
    ... ... @@ -32,20 +32,14 @@ RUN apt-get update && apt-get install -y \
    32 32
             x11-utils \
    
    33 33
             xvfb \
    
    34 34
             xz-utils \
    
    35
    -        wget && \
    
    36
    -    apt-get clean && \
    
    37
    -    rm -rf /var/lib/apt/lists/*
    
    38
    -
    
    39
    -WORKDIR /app
    
    35
    +        wget
    
    40 36
     
    
    41
    -COPY taskcluster/docker/recipes/install-node.sh ./install-node.sh
    
    42
    -RUN chmod +x install-node.sh
    
    43
    -RUN ./install-node.sh
    
    44
    -RUN rm ./install-node.sh
    
    37
    +RUN curl -fsSL https://deb.nodesource.com/setup_lts.x -o nodesource_setup.sh && \
    
    38
    +    bash nodesource_setup.sh && \
    
    39
    +    apt-get install -y nodejs
    
    45 40
     
    
    46
    -COPY taskcluster/kinds/fetch/toolchains.yml ./toolchains.yml
    
    47
    -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $(grep -oP 'rust-\K[0-9.]+(?=:)' ./toolchains.yml)
    
    48
    -RUN $HOME/.cargo/bin/cargo install cbindgen --version $(grep -oP 'cbindgen-\K[0-9.]+(?=:)' ./toolchains.yml)
    
    49
    -RUN rm ./toolchains.yml
    
    41
    +RUN apt-get clean && \
    
    42
    +    rm -rf /var/lib/apt/lists/*
    
    50 43
     
    
    51
    -CMD ["/bin/bash"]
    44
    +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
    
    45
    +    $HOME/.cargo/bin/cargo install cbindgen