Merge pull request #412 from dronecore/fix-clang-format

Fix clang format
mavlink · May 25, 2018 · 12dba0c · 12dba0c
2 parents 9b6bd5f + 2d12373
commit 12dba0c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/docker/Dockerfile-Fedora-27 b/docker/Dockerfile-Fedora-27
@@ -9,24 +9,24 @@ FROM fedora:27
 MAINTAINER Julian Oes <julian@oes.ch>
 
 RUN dnf -y install \
+    autoconf \
+    automake \
+    clang-format \
+    colordiff \
+    cmake \
+    doxygen \
     gcc \
     gcc-c++ \
-    cmake \
     git \
-    colordiff \
-    tinyxml2-devel \
     libcurl-devel \
-    rubygems \
-    ruby-devel \
+    libtool \
+    python \
+    tinyxml2-devel \
     redhat-rpm-config \
     rpm-build \
-    autoconf \
-    automake \
-    libtool \
+    ruby-devel \
+    rubygems \
     which \
-    astyle \
-    doxygen \
-    python \
     && dnf clean all
 
 RUN gem install --no-ri --no-rdoc fpm;

diff --git a/docker/Dockerfile-Ubuntu-16.04 b/docker/Dockerfile-Ubuntu-16.04
@@ -11,24 +11,24 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update \
     && apt-get -y --quiet --no-install-recommends install \
-        cmake \
+        autoconf \
+        automake \
+        autotools-dev \
         build-essential \
+        ca-certificates \
+        clang-format \
         colordiff \
+        cmake \
+        doxygen \
         git \
         libcurl4-openssl-dev \
-        doxygen \
-        autoconf \
+        libltdl-dev \
+        libtinyxml2-dev \
         libtool \
-        wget \
-        ca-certificates \
-        autoconf \
-        automake \
         python \
-        autotools-dev \
-        libltdl-dev \
         python-pip \
-        libtinyxml2-dev \
         ruby-dev \
+        wget \
     && apt-get -y autoremove \
     && apt-get clean autoclean \
     && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*