Просмотр исходного кода

Merge pull request #76 from Flipper-Zero/improve_docker_file

cosmetic improve docker dockerfile
Henry 5 лет назад
Родитель
Сommit
1b82b3d3b6
2 измененных файлов с 22 добавлено и 8 удалено
  1. 2 0
      .gitignore
  2. 20 8
      Dockerfile

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+.idea/
+target_lo/build/

+ 20 - 8
Dockerfile

@@ -1,14 +1,26 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-make gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi \
-autoconf automake libtool curl wget g++ unzip build-essential curl && \
-apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-python python-pip libstdc++-arm-none-eabi-newlib && \
-apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN apt-get update && \
+    apt install -y --no-install-recommends \
+        make \
+        gcc-arm-none-eabi \
+        binutils-arm-none-eabi \
+        libnewlib-arm-none-eabi \
+        autoconf \
+        automake \
+        libtool \
+        curl \
+        wget \
+        g++ \
+        unzip \
+        build-essential \
+        python \
+        python-pip \
+        libstdc++-arm-none-eabi-newlib \
+        curl && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile=minimal --target thumbv7em-none-eabi thumbv7em-none-eabihf
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile=minimal --target thumbv7em-none-eabi thumbv7em-none-eabihf
+
 ENV PATH="/root/.cargo/bin:${PATH}"
 ENV PATH="/root/.cargo/bin:${PATH}"
 ENV USER=root
 ENV USER=root