summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Johanson <peter@peterjohanson.com>2020-05-10 23:38:45 -0400
committerPete Johanson <peter@peterjohanson.com>2020-05-10 23:38:45 -0400
commitaefc6220f5b22dd019ca65ed882c613f7fe02280 (patch)
treebae7bbecaf71165723aab217746bd7c2333b8b4a
parent1ada9181744cf6d6d01206d7e5635909bae00059 (diff)
Tweak dep installs.
-rw-r--r--Dockerfile36
1 files changed, 17 insertions, 19 deletions
diff --git a/Dockerfile b/Dockerfile
index 837e1a1..08b5c8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,25 +3,7 @@ FROM debian:stable-slim
RUN apt-get -y update && \
apt-get -y upgrade && \
apt-get install --no-install-recommends -y \
- wget
-
-ARG ZSDK_VERSION=0.11.2
-RUN wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-sdk-${ZSDK_VERSION}-setup.run" && \
- sh "zephyr-sdk-${ZSDK_VERSION}-setup.run" --quiet -- -d /opt/toolchains/zephyr-sdk-${ZSDK_VERSION} && \
- rm "zephyr-sdk-${ZSDK_VERSION}-setup.run"
-
-ARG CMAKE_VERSION=3.16.2
-RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
- chmod +x cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
- ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/usr/local && \
- rm -f ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh
-
-ARG UID=1000
-ARG GID=1000
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get install --no-install-recommends -y \
+ wget \
gnupg \
ca-certificates \
autoconf \
@@ -52,6 +34,22 @@ RUN apt-get install --no-install-recommends -y \
xz-utils && \
rm -rf /var/lib/apt/lists/*
+ARG ZSDK_VERSION=0.11.2
+RUN wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-sdk-${ZSDK_VERSION}-setup.run" && \
+ sh "zephyr-sdk-${ZSDK_VERSION}-setup.run" --quiet -- -d /opt/toolchains/zephyr-sdk-${ZSDK_VERSION} && \
+ rm "zephyr-sdk-${ZSDK_VERSION}-setup.run"
+
+ARG CMAKE_VERSION=3.16.2
+RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
+ chmod +x cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
+ ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/usr/local && \
+ rm -f ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh
+
+ARG UID=1000
+ARG GID=1000
+
+ENV DEBIAN_FRONTEND noninteractive
+
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en