From 3eab95ea4ecfc31bef27c20e713ec1af24db2508 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sat, 12 Dec 2020 13:02:55 +1000 Subject: [PATCH] Add cleanup and make download stages more readable --- docker/amd64/Dockerfile | 14 ++++++++++---- docker/arm64v8/Dockerfile | 10 ++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile index c5bccb14..5f3c77ec 100644 --- a/docker/amd64/Dockerfile +++ b/docker/amd64/Dockerfile @@ -14,10 +14,16 @@ RUN apt-get update -qq \ wget \ && rm -rf /var/cache/apt/* /var/lib/apt/lists/* -RUN wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz -O - | tar -xj -C /opt/ -RUN wget -q https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip && unzip -q nRF5_SDK_15.3.0_59ac345.zip -d /opt/ && rm nRF5_SDK_15.3.0_59ac345.zip +RUN wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz \ + && tar -xjf gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz -C /opt \ + && rm gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz + +RUN wget -q https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip \ + && unzip -q nRF5_SDK_15.3.0_59ac345.zip -d /opt/ && rm nRF5_SDK_15.3.0_59ac345.zip + +RUN git clone https://github.com/JuulLabs-OSS/mcuboot.git /opt/mcuboot \ + && pip3 install -r /opt/mcuboot/scripts/requirements.txt -RUN git clone https://github.com/JuulLabs-OSS/mcuboot.git /opt/mcuboot && pip3 install -r /opt/mcuboot/scripts/requirements.txt RUN pip3 install adafruit-nrfutil ARG PUID=1000 @@ -25,4 +31,4 @@ ARG PGID=1000 RUN groupadd --system --gid $PGID infinitime && useradd --system --uid $PUID --gid $PGID infinitime USER infinitime:infinitime -CMD ["/sources/docker/build.sh"] \ No newline at end of file +CMD ["/sources/docker/build.sh"] diff --git a/docker/arm64v8/Dockerfile b/docker/arm64v8/Dockerfile index 9de2b908..cea2b837 100644 --- a/docker/arm64v8/Dockerfile +++ b/docker/arm64v8/Dockerfile @@ -17,10 +17,16 @@ RUN apt-get update -qq \ wget \ && rm -rf /var/cache/apt/* /var/lib/apt/lists/* -RUN wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-aarch64-linux.tar.bz2 -O - | tar -xj -C /opt/ -RUN wget -q https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip && unzip -q nRF5_SDK_15.3.0_59ac345.zip -d /opt/ && rm nRF5_SDK_15.3.0_59ac345.zip +RUN wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-aarch64-linux.tar.bz2 \ + && tar -xjf gcc-arm-none-eabi-9-2020-q2-update-aarch64-linux.tar.bz2 -C /opt \ + && rm gcc-arm-none-eabi-9-2020-q2-update-aarch64-linux.tar.bz2 + +RUN wget -q https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip \ + && unzip -q nRF5_SDK_15.3.0_59ac345.zip -d /opt/ \ + && rm nRF5_SDK_15.3.0_59ac345.zip RUN git clone https://github.com/JuulLabs-OSS/mcuboot.git /opt/mcuboot && pip3 install -r /opt/mcuboot/scripts/requirements.txt + RUN pip3 install adafruit-nrfutil ARG PUID=1000