diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/amd64/Dockerfile | 39 | ||||
| -rw-r--r-- | docker/arm64v8/Dockerfile | 38 |
2 files changed, 57 insertions, 20 deletions
diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile index 7899c8cc..5f3c77ec 100644 --- a/docker/amd64/Dockerfile +++ b/docker/amd64/Dockerfile @@ -1,17 +1,34 @@ -FROM ubuntu:18.04 +FROM amd64/ubuntu:18.04 -ARG USER_ID -ARG GROUP_ID +ARG DEBIAN_FRONTEND=noninteractive +RUN apt-get update -qq \ + && apt-get install -y \ + build-essential \ + cmake \ + git \ + make \ + python3 \ + python3-pip \ + tar \ + unzip \ + wget \ + && rm -rf /var/cache/apt/* /var/lib/apt/lists/* -RUN addgroup --gid $GROUP_ID user -RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user +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 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 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 -USER user -CMD ["/sources/docker/build.sh"]
\ No newline at end of file +ARG PUID=1000 +ARG PGID=1000 +RUN groupadd --system --gid $PGID infinitime && useradd --system --uid $PUID --gid $PGID infinitime + +USER infinitime:infinitime +CMD ["/sources/docker/build.sh"] diff --git a/docker/arm64v8/Dockerfile b/docker/arm64v8/Dockerfile index 87c5c627..cea2b837 100644 --- a/docker/arm64v8/Dockerfile +++ b/docker/arm64v8/Dockerfile @@ -1,17 +1,37 @@ -FROM ubuntu:18.04 +FROM arm64v8/ubuntu:18.04 -ARG USER_ID -ARG GROUP_ID +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update -qq \ + && apt-get install -y \ + build-essential \ + cmake \ + git \ + libffi-dev \ + libssl-dev \ + make \ + python3 \ + python3-dev \ + python3-pip \ + tar \ + unzip \ + wget \ + && rm -rf /var/cache/apt/* /var/lib/apt/lists/* -RUN addgroup --gid $GROUP_ID user -RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user +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 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 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 +ARG PUID=1000 +ARG PGID=1000 +RUN groupadd --system --gid $PGID infinitime && useradd --system --uid $PUID --gid $PGID infinitime + +USER infinitime:infinitime CMD ["/sources/docker/build.sh"] |