Skip to content

Commit 273a94f

Browse files
nscoolinggeekbozu
authored andcommitted
removed dependency on build.sh
1 parent 65423b3 commit 273a94f

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ RUN apt-get update -qq \
2222
rustc \
2323
&& rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
2424

25-
RUN adduser infinitime
26-
2725
RUN pip3 install adafruit-nrfutil
2826
# required for McuBoot
2927
RUN pip3 install setuptools_rust
@@ -34,10 +32,19 @@ COPY build.sh .
3432

3533
# Lets get each in a separate docker layer for better downloads
3634
# GCC
37-
RUN bash -c "source /opt/build.sh; GetGcc;"
35+
# RUN bash -c "source /opt/build.sh; GetGcc;"
36+
RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 -O - | tar -xj -C /opt
37+
# RUN rm gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2
3838
# NrfSdk
39-
RUN bash -c "source /opt/build.sh; GetNrfSdk;"
39+
# RUN bash -c "source /opt/build.sh; GetNrfSdk;"
40+
RUN wget -q "https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip" -O /tmp/nRF5_SDK_15.3.0_59ac345
41+
RUN unzip -q /tmp/nRF5_SDK_15.3.0_59ac345 -d /opt
42+
RUN rm /tmp/nRF5_SDK_15.3.0_59ac345
4043
# McuBoot
41-
RUN bash -c "source /opt/build.sh; GetMcuBoot;"
44+
# RUN bash -c "source /opt/build.sh; GetMcuBoot;"
45+
RUN git clone https://github.com/JuulLabs-OSS/mcuboot.git
46+
RUN pip3 install -r ./mcuboot/scripts/requirements.txt
47+
48+
RUN adduser infinitime
4249

4350
ENV SOURCES_DIR /workspaces/Pinetime

0 commit comments

Comments
 (0)