From df6bcdd751b129223ebb20296e1104a1d48c42ab Mon Sep 17 00:00:00 2001 From: schaeff Date: Mon, 1 Aug 2022 19:44:58 +0100 Subject: [PATCH] remove leftover cpp support --- .clang-format | 11 ----------- Dockerfile | 4 +--- Dockerfile.env | 5 ----- scripts/install_libsnark_prerequisites.sh | 13 ------------- 4 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 .clang-format delete mode 100755 scripts/install_libsnark_prerequisites.sh diff --git a/.clang-format b/.clang-format deleted file mode 100644 index d0485a3f..00000000 --- a/.clang-format +++ /dev/null @@ -1,11 +0,0 @@ -Language: Cpp -BasedOnStyle: WebKit - -AllowShortCaseLabelsOnASingleLine: true -AllowShortFunctionsOnASingleLine: true -AlwaysBreakTemplateDeclarations: true -BinPackArguments: false -BinPackParameters: false -# make adding new members at the end less noisy in diffs -BreakConstructorInitializersBeforeComma: true -ConstructorInitializerAllOnOneLineOrOnePerLine: true \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index cef449fc..1dfcffd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,7 @@ RUN cd src; ./build_release.sh FROM ubuntu:20.04 ENV ZOKRATES_HOME=/home/zokrates/.zokrates -RUN apt-get update \ - && apt-get install -y --no-install-recommends libgmp3-dev \ - && useradd -u 1000 -m zokrates +RUN useradd -u 1000 -m zokrates USER zokrates WORKDIR /home/zokrates diff --git a/Dockerfile.env b/Dockerfile.env index 862bd3b6..468d24e2 100644 --- a/Dockerfile.env +++ b/Dockerfile.env @@ -1,7 +1,6 @@ FROM ubuntu:20.04 SHELL ["/bin/bash", "-c"] -ARG RUST_VERSION=nightly ARG DEBIAN_FRONTEND=noninteractive ENV RUSTUP_HOME=/usr/local/rustup \ @@ -25,12 +24,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain none -y \ - && rustup toolchain install $RUST_VERSION --allow-downgrade --profile minimal --component rustfmt clippy \ && curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs && npm i -g solc \ && curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh \ - && curl -sL https://raw.githubusercontent.com/Sarcasm/run-clang-format/master/run-clang-format.py > /opt/run-clang-format.py \ - && chmod +x /opt/run-clang-format.py \ - && ln -s /opt/run-clang-format.py /usr/bin \ && rustup --version; cargo --version; rustc --version; wasm-pack --version; echo nodejs $(node -v); RUN cd /opt && curl -LO https://github.com/mozilla/geckodriver/releases/download/v0.28.0/geckodriver-v0.28.0-linux64.tar.gz \ diff --git a/scripts/install_libsnark_prerequisites.sh b/scripts/install_libsnark_prerequisites.sh deleted file mode 100755 index 7b83137b..00000000 --- a/scripts/install_libsnark_prerequisites.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -apt-get update && apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - libboost-dev \ - libboost-program-options-dev \ - libgmp3-dev \ - libprocps-dev \ - libssl-dev \ - pkg-config \ - python-markdown \ - && rm -rf /var/lib/apt/lists/* \