clean dockerfiles, execute prerequisites as root
This commit is contained in:
parent
31149cdff0
commit
293477ed6c
4 changed files with 10 additions and 40 deletions
14
Dockerfile
14
Dockerfile
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
|
||||
|
@ -10,18 +10,12 @@ ENV ZOKRATES_HOME=/home/zokrates/.zokrates
|
|||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
build-essential \
|
||||
cmake \
|
||||
curl \
|
||||
libboost-dev \
|
||||
libboost-program-options-dev \
|
||||
libgmp3-dev \
|
||||
libprocps-dev \
|
||||
libssl-dev \
|
||||
pkg-config \
|
||||
python-markdown \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY ./scripts/install_libsnark_prerequisites.sh /tmp/
|
||||
RUN /tmp/install_libsnark_prerequisites.schaeff
|
||||
|
||||
USER zokrates
|
||||
|
||||
WORKDIR /home/zokrates
|
||||
|
|
|
@ -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
|
||||
|
||||
|
@ -8,20 +8,11 @@ ARG RUST_TOOLCHAIN=nightly-2019-01-01
|
|||
ENV WITH_LIBSNARK=1
|
||||
ENV ZOKRATES_HOME=/home/zokrates/ZoKrates/stdlib/
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl
|
||||
|
||||
COPY --chown=zokrates:zokrates . ZoKrates
|
||||
|
||||
RUN ./ZoKrates/scripts/install_libsnark_prerequisites.sh
|
||||
COPY ./scripts/install_libsnark_prerequisites.sh /tmp/
|
||||
RUN /tmp/install_libsnark_prerequisites.sh
|
||||
|
||||
USER zokrates
|
||||
|
||||
RUN curl https://sh.rustup.rs -sSf | \
|
||||
sh -s -- --default-toolchain $RUST_TOOLCHAIN -y
|
||||
WORKDIR /home/zokrates
|
||||
|
||||
ENV PATH=/home/zokrates/.cargo/bin:$PATH
|
||||
|
||||
RUN cd ZoKrates \
|
||||
&& ./build.sh
|
||||
COPY --chown=zokrates:zokrates . ZoKrates
|
||||
|
|
|
@ -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/* \
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
gcc \
|
||||
cmake \
|
||||
libboost-dev \
|
||||
libboost-program-options-dev \
|
||||
|
|
Loading…
Reference in a new issue