From 8f69a45fd97208e1b1caefc4013a10e3c382c0b8 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Fri, 20 Nov 2020 10:07:17 +1000 Subject: Rename dockerfile folders to correct architectures --- docker/amd64/Dockerfile | 17 +++++++++++++++++ docker/arm64/Dockerfile | 17 ----------------- docker/arm64v8/Dockerfile | 17 +++++++++++++++++ docker/x86_64/Dockerfile | 17 ----------------- 4 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 docker/amd64/Dockerfile delete mode 100644 docker/arm64/Dockerfile create mode 100644 docker/arm64v8/Dockerfile delete mode 100644 docker/x86_64/Dockerfile (limited to 'docker') diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile new file mode 100644 index 00000000..7899c8cc --- /dev/null +++ b/docker/amd64/Dockerfile @@ -0,0 +1,17 @@ +FROM ubuntu:18.04 + +ARG USER_ID +ARG GROUP_ID + +RUN addgroup --gid $GROUP_ID user +RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user + +RUN apt-get update -qq && apt-get install -y wget unzip cmake make build-essential git python3 python3-pip +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 git clone https://github.com/JuulLabs-OSS/mcuboot.git /opt/mcuboot && pip3 install -r /opt/mcuboot/scripts/requirements.txt +RUN pip3 install adafruit-nrfutil + +USER user +CMD ["/sources/docker/build.sh"] \ No newline at end of file diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile deleted file mode 100644 index 87c5c627..00000000 --- a/docker/arm64/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM ubuntu:18.04 - -ARG USER_ID -ARG GROUP_ID - -RUN addgroup --gid $GROUP_ID user -RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user - -RUN apt-get update -qq && apt-get install -y wget unzip cmake make build-essential git python3 python3-pip libffi-dev libssl-dev python3-dev -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 git clone https://github.com/JuulLabs-OSS/mcuboot.git /opt/mcuboot && pip3 install -r /opt/mcuboot/scripts/requirements.txt -RUN pip3 install adafruit-nrfutil - -USER user -CMD ["/sources/docker/build.sh"] diff --git a/docker/arm64v8/Dockerfile b/docker/arm64v8/Dockerfile new file mode 100644 index 00000000..87c5c627 --- /dev/null +++ b/docker/arm64v8/Dockerfile @@ -0,0 +1,17 @@ +FROM ubuntu:18.04 + +ARG USER_ID +ARG GROUP_ID + +RUN addgroup --gid $GROUP_ID user +RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user + +RUN apt-get update -qq && apt-get install -y wget unzip cmake make build-essential git python3 python3-pip libffi-dev libssl-dev python3-dev +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 git clone https://github.com/JuulLabs-OSS/mcuboot.git /opt/mcuboot && pip3 install -r /opt/mcuboot/scripts/requirements.txt +RUN pip3 install adafruit-nrfutil + +USER user +CMD ["/sources/docker/build.sh"] diff --git a/docker/x86_64/Dockerfile b/docker/x86_64/Dockerfile deleted file mode 100644 index 7899c8cc..00000000 --- a/docker/x86_64/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM ubuntu:18.04 - -ARG USER_ID -ARG GROUP_ID - -RUN addgroup --gid $GROUP_ID user -RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user - -RUN apt-get update -qq && apt-get install -y wget unzip cmake make build-essential git python3 python3-pip -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 git clone https://github.com/JuulLabs-OSS/mcuboot.git /opt/mcuboot && pip3 install -r /opt/mcuboot/scripts/requirements.txt -RUN pip3 install adafruit-nrfutil - -USER user -CMD ["/sources/docker/build.sh"] \ No newline at end of file -- cgit v1.2.3