Merge pull request #717 from dark64/fix-dockerfile-env

Update docker files

.circleci/config.yml

@@ -75,12 +75,11 @@ jobs:
             - v4-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
       - run:
           name: Test on firefox
-          command: GECKODRIVER=geckodriver cd zokrates_core && wasm-pack test --firefox --headless -- --no-default-features --features "wasm bellman"
+          command: cd zokrates_core && wasm-pack test --firefox --headless -- --no-default-features --features "wasm bellman"
   integration_test:
     docker:
       - image: zokrates/env:latest
       - image: trufflesuite/ganache-cli:next
-        port: 8545:8545
     steps:
       - checkout
       - run:

Dockerfile

@@ -9,10 +9,9 @@ RUN cd src; ./build_release.sh
 FROM ubuntu:18.04
 ENV ZOKRATES_HOME=/home/zokrates/.zokrates
 
-COPY --from=build /build/src/scripts/install_libsnark_prerequisites.sh /tmp/
-
-RUN /tmp/install_libsnark_prerequisites.sh \
-&& useradd -u 1000 -m zokrates
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends libgmp3-dev \
+    && useradd -u 1000 -m zokrates
 
 USER zokrates
 WORKDIR /home/zokrates

Dockerfile.env

@@ -22,20 +22,24 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         clang-format \
         python3 \
         python-markdown \
-        && add-apt-repository ppa:jonathonf/firefox-esr; apt-get install -y firefox-esr \
+        && add-apt-repository ppa:mozillateam/ppa \
+        && apt-get update \
+        && apt-get install -y --no-install-recommends firefox-esr \
+        && ln -s /usr/bin/firefox-esr /usr/bin/firefox \
         && 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 nightly --allow-downgrade --profile minimal --component rustfmt \
     && cargo install --git https://github.com/rustwasm/wasm-pack \
+    && rm -rf /usr/local/cargo/registry \
     && curl -sL https://deb.nodesource.com/setup_lts.x | bash - && apt-get install -y nodejs && npm i -g solc \
     && 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.26.0/geckodriver-v0.26.0-linux64.tar.gz \
-    && tar -xzf geckodriver-v0.26.0-linux64.tar.gz geckodriver \
+RUN cd /opt && curl -LO https://github.com/mozilla/geckodriver/releases/download/v0.28.0/geckodriver-v0.28.0-linux64.tar.gz \
+    && tar -xzf geckodriver-v0.28.0-linux64.tar.gz geckodriver \
     && ln -s /opt/geckodriver /usr/bin \
     && geckodriver --version \
-    && rm -rf geckodriver-v0.26.0-linux64.tar.gz
+    && rm -rf geckodriver-v0.28.0-linux64.tar.gz