summaryrefslogtreecommitdiff
path: root/docker/x86_64
diff options
context:
space:
mode:
authorJF <jf@codingfield.com>2020-08-19 19:52:46 (GMT)
committerJF <jf@codingfield.com>2020-08-19 19:52:46 (GMT)
commitf197a3fe883cb7ebc028d4cfab199a4d998b125a (patch)
treeee027cc0e3e7f8fe0f030217f3b81af80c835081 /docker/x86_64
parent38418931f1ee46e5405d48fcee18005b6ab4c4c7 (diff)
All output files (bin, hex, image, dfu) contain the version of the project in their filename.
Update Docker build script accordingly. Also fix permission issue with docker build (all files belonged to root).
Diffstat (limited to 'docker/x86_64')
-rw-r--r--docker/x86_64/Dockerfile9
1 files changed, 8 insertions, 1 deletions
diff --git a/docker/x86_64/Dockerfile b/docker/x86_64/Dockerfile
index 6dd604b..7899c8c 100644
--- a/docker/x86_64/Dockerfile
+++ b/docker/x86_64/Dockerfile
@@ -1,4 +1,11 @@
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
@@ -6,5 +13,5 @@ RUN wget -q https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_
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