github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-23 12:18:44 +00:00
Code Issues Projects Releases Wiki Activity

clean dockerfiles, execute prerequisites as root

Browse source
This commit is contained in:
schaeff 2019-02-08 16:58:45 +01:00
parent 31149cdff0
commit 293477ed6c
4 changed files with 10 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Dockerfile
View file

@ -1,6 +1,6 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
MAINTAINER JacobEberhardt <jacob.eberhardt@tu-berlin.de>, Dennis Kuhnert <mail@kyroy.com>, Thibaut Schaeffer <thibaut@schaeff.fr> MAINTAINER JacobEberhardt <jacob.eberhardt@tu-berlin.de>, Thibaut Schaeffer <thibaut@schaeff.fr>
RUN useradd -u 1000 -m zokrates RUN useradd -u 1000 -m zokrates
@ -10,18 +10,12 @@ ENV ZOKRATES_HOME=/home/zokrates/.zokrates
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
build-essential \
cmake \
curl \ curl \
libboost-dev \
libboost-program-options-dev \
libgmp3-dev \
libprocps-dev \
libssl-dev \
pkg-config \
python-markdown \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY ./scripts/install_libsnark_prerequisites.sh /tmp/
RUN /tmp/install_libsnark_prerequisites.schaeff
USER zokrates USER zokrates
WORKDIR /home/zokrates WORKDIR /home/zokrates

21
dev.Dockerfile
View file

@ -1,6 +1,6 @@
FROM ubuntu:18.04 FROM rustlang/rust:nightly
MAINTAINER JacobEberhardt <jacob.eberhardt@tu-berlin.de>, Dennis Kuhnert <mail@kyroy.com>, Thibaut Schaeffer <thibaut@schaeff.fr> MAINTAINER JacobEberhardt <jacob.eberhardt@tu-berlin.de>, Thibaut Schaeffer <thibaut@schaeff.fr>
RUN useradd -u 1000 -m zokrates RUN useradd -u 1000 -m zokrates
@ -8,20 +8,11 @@ ARG RUST_TOOLCHAIN=nightly-2019-01-01
ENV WITH_LIBSNARK=1 ENV WITH_LIBSNARK=1
ENV ZOKRATES_HOME=/home/zokrates/ZoKrates/stdlib/ ENV ZOKRATES_HOME=/home/zokrates/ZoKrates/stdlib/
RUN apt-get update && apt-get install -y --no-install-recommends \ COPY ./scripts/install_libsnark_prerequisites.sh /tmp/
ca-certificates \ RUN /tmp/install_libsnark_prerequisites.sh
curl
COPY --chown=zokrates:zokrates . ZoKrates
RUN ./ZoKrates/scripts/install_libsnark_prerequisites.sh
USER zokrates USER zokrates
RUN curl https://sh.rustup.rs -sSf | \ WORKDIR /home/zokrates
sh -s -- --default-toolchain $RUST_TOOLCHAIN -y
ENV PATH=/home/zokrates/.cargo/bin:$PATH COPY --chown=zokrates:zokrates . ZoKrates
RUN cd ZoKrates \
&& ./build.sh

14
install_libsnark_prerequisites.sh
View file

@ -1,14 +0,0 @@
#!/bin/bash
apt-get update && apt-get install -y --no-install-recommends \
build-essential \
gcc \
cmake \
libboost-dev \
libboost-program-options-dev \
libgmp3-dev \
libprocps-dev \
libssl-dev \
pkg-config \
python-markdown \
&& rm -rf /var/lib/apt/lists/* \

1
scripts/install_libsnark_prerequisites.sh
View file

@ -2,7 +2,6 @@
apt-get update && apt-get install -y --no-install-recommends \ apt-get update && apt-get install -y --no-install-recommends \
build-essential \ build-essential \
gcc \
cmake \ cmake \
libboost-dev \ libboost-dev \
libboost-program-options-dev \ libboost-program-options-dev \