File tree 3 files changed +23
-33
lines changed 3 files changed +23
-33
lines changed Original file line number Diff line number Diff line change @@ -19,9 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
19
19
bzip2 \
20
20
patch \
21
21
libssl-dev \
22
- pkg-config \
23
- software-properties-common \
24
- apt-transport-https
22
+ pkg-config
25
23
26
24
COPY scripts/dumb-init.sh /scripts/
27
25
RUN sh /scripts/dumb-init.sh
Original file line number Diff line number Diff line change
1
+ #! /bin/bash
1
2
# Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2
3
# file at the top-level directory of this distribution and at
3
4
# http://rust-lang.org/COPYRIGHT.
8
9
# option. This file may not be copied, modified, or distributed
9
10
# except according to those terms.
10
11
12
+ # ignore-tidy-linelength
13
+
11
14
set -ex
12
15
16
+ apt-get update
17
+ apt-get install -y --no-install-recommends software-properties-common apt-transport-https
18
+
13
19
apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F
14
20
add-apt-repository -y ' deb https://static.redox-os.org/toolchain/apt /'
21
+
15
22
apt-get update
16
23
apt-get install -y x86-64-unknown-redox-gcc
Original file line number Diff line number Diff line change 1
1
FROM ubuntu:16.04
2
2
3
- RUN apt-get update && apt-get install -y --no-install-recommends \
4
- g++ \
5
- make \
6
- file \
7
- curl \
8
- ca-certificates \
9
- python2.7 \
10
- git \
11
- cmake \
12
- sudo \
13
- bzip2 \
14
- xz-utils \
15
- wget \
16
- libssl-dev \
17
- pkg-config \
18
- software-properties-common \
19
- apt-transport-https
20
-
21
- # Install the cross compiler
22
- RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F && \
23
- add-apt-repository -y 'deb https://static.redox-os.org/toolchain/apt /' && \
24
- apt-get update && \
25
- apt-get install -y x86-64-unknown-redox-gcc
26
-
27
- RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
28
- dpkg -i dumb-init_*.deb && \
29
- rm dumb-init_*.deb
3
+ COPY scripts/cross-apt-packages.sh /scripts/
4
+ RUN sh /scripts/cross-apt-packages.sh
5
+
6
+ COPY scripts/dumb-init.sh /scripts/
7
+ RUN sh /scripts/dumb-init.sh
8
+
30
9
ENTRYPOINT ["/usr/bin/dumb-init" , "--" ]
31
10
32
- RUN curl -o /usr/local/bin/sccache \
33
- https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl && \
34
- chmod +x /usr/local/bin/sccache
11
+ COPY scripts/crosstool-ng.sh /scripts/
12
+ RUN sh /scripts/crosstool-ng.sh
13
+
14
+ WORKDIR /tmp
15
+ COPY cross/install-x86_64-redox.sh /tmp/
16
+ RUN ./install-x86_64-redox.sh
17
+
18
+ COPY scripts/sccache.sh /scripts/
19
+ RUN sh /scripts/sccache.sh
35
20
36
21
ENV \
37
22
AR_x86_64_unknown_redox=x86_64-unknown-redox-ar \
You can’t perform that action at this time.
0 commit comments