pwarren
/
zmk_mf68
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Docker tweaks.

This commit is contained in:
Pete Johanson 2020-05-11 11:09:10 -04:00
parent 694e73a4cf
commit 9d21a0daa4
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Dockerfile
View File

@ -4,7 +4,6 @@ RUN apt-get -y update && \
apt-get -y upgrade && \ apt-get -y upgrade && \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
wget \ wget \
gnupg \
ca-certificates \ ca-certificates \
autoconf \ autoconf \
automake \ automake \
@ -16,21 +15,16 @@ RUN apt-get -y update && \
g++ \ g++ \
gcc \ gcc \
gcc-multilib \ gcc-multilib \
gcovr \
git \ git \
git-core \
iproute2 \ iproute2 \
libpcap-dev \ libpcap-dev \
libtool \ libtool \
locales \ locales \
make \ make \
net-tools \
ninja-build \ ninja-build \
python3-dev \ python3-dev \
python3-pip \ python3-pip \
python3-ply \
python3-setuptools \ python3-setuptools \
python-xdg \
xz-utils && \ xz-utils && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
@ -45,9 +39,6 @@ RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}
./cmake-${CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/usr/local && \ ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/usr/local && \
rm -f ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh rm -f ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh
ARG UID=1000
ARG GID=1000
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN locale-gen en_US.UTF-8 RUN locale-gen en_US.UTF-8
@ -61,21 +52,13 @@ RUN wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/s
wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-doc.txt && \ wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-doc.txt && \
wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-run-test.txt && \ wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-run-test.txt && \
wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-extras.txt && \ wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-extras.txt && \
pip3 install wheel &&\ pip3 install wheel && \
pip3 install -r requirements.txt && \ pip3 install -r requirements.txt && \
pip3 install west &&\ pip3 install west && \
pip3 install sh pip3 install sh
RUN groupadd -g $GID -o user
RUN useradd -u $UID -m -g user user
# Set the locale # Set the locale
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZSDK_VERSION} ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZSDK_VERSION}
ENV ZEPHYR_BASE=/workdir
RUN chown -R user:user /home/user
CMD ["/bin/bash"] CMD ["/bin/bash"]
USER user
WORKDIR /workdir