Przeglądaj źródła

Fix docker build (#323)

* fix repos for clang
* fix path for CLANG_FORMAT_BIN in syntax_check.sh
* get version for clang-format
* fix versions for clang-format
rusdacent 5 lat temu
rodzic
commit
7481cfd6eb
2 zmienionych plików z 3 dodań i 2 usunięć
  1. 2 2
      docker/Dockerfile
  2. 1 0
      docker/syntax_check.sh

+ 2 - 2
docker/Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:18.04
 ENV PATH /root/.cargo/bin:$PATH
 
 RUN apt update && \
-    apt install -y --no-install-recommends \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
         software-properties-common \
         gpg-agent \
         make \
@@ -26,7 +26,7 @@ RUN apt update && \
         git \
         && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main"
+RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main"
 
 RUN apt update && \
     apt install -y --no-install-recommends \

+ 1 - 0
docker/syntax_check.sh

@@ -18,6 +18,7 @@ C_FILES=$(find . \
     -name *.c -o -name *.h -o -name *.cpp)
 
 ulimit -s 65536
+$CLANG_FORMAT_BIN --version
 $CLANG_FORMAT_BIN --verbose -style=file -n --Werror --ferror-limit=0 $C_FILES
 c_syntax_rc=$?