Merge branch 'a5-stable-lize' of github.com:paritytech/parity into a5-stable-lize

This commit is contained in:
Tomasz Drwięga 2018-07-13 14:06:26 +02:00
commit 5235a6ab03
No known key found for this signature in database
GPG Key ID: D066F497E62CAF66
7 changed files with 35 additions and 4 deletions

2
Cargo.lock generated
View File

@ -1219,7 +1219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "hidapi" name = "hidapi"
version = "0.3.1" version = "0.3.1"
source = "git+https://github.com/paritytech/hidapi-rs#70ec4bd1b755ec5dd32ad2be0c8345864147c8bc" source = "git+https://github.com/paritytech/hidapi-rs#d4d323767d6f27cf5a3d73fbae0b0f2134d579bf"
dependencies = [ dependencies = [
"cc 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",

29
docker/alpine/Dockerfile Normal file
View File

@ -0,0 +1,29 @@
FROM alpine:edge
WORKDIR /build
# install tools and dependencies
RUN apk add --no-cache gcc musl-dev pkgconfig g++ make curl \
eudev-dev rust cargo git file binutils \
libusb-dev linux-headers perl cmake
# show backtraces
ENV RUST_BACKTRACE 1
# show tools
RUN rustc -vV && \
cargo -V && \
gcc -v &&\
g++ -v
# build parity
ADD . /build/parity
RUN cd parity && \
cargo build --release --verbose && \
ls /build/parity/target/release/parity && \
strip /build/parity/target/release/parity
RUN file /build/parity/target/release/parity
EXPOSE 8080 8545 8180
ENTRYPOINT ["/build/parity/target/release/parity"]

View File

@ -3,7 +3,7 @@ WORKDIR /build
# install tools and dependencies # install tools and dependencies
RUN yum -y update&& \ RUN yum -y update&& \
yum install -y git make gcc-c++ gcc file binutils yum install -y git make gcc-c++ gcc file binutils cmake
# install rustup # install rustup
RUN curl -sSf https://static.rust-lang.org/rustup.sh -o rustup.sh &&\ RUN curl -sSf https://static.rust-lang.org/rustup.sh -o rustup.sh &&\

View File

@ -13,6 +13,7 @@ RUN apt-get update && \
# add-apt-repository # add-apt-repository
software-properties-common \ software-properties-common \
make \ make \
cmake \
curl \ curl \
wget \ wget \
git \ git \

View File

@ -6,7 +6,7 @@ RUN apt-get -y update && \
apt-get install -y --force-yes --no-install-recommends \ apt-get install -y --force-yes --no-install-recommends \
curl git make g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \ curl git make g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
libc6-arm64-cross libc6-dev-arm64-cross wget file ca-certificates \ libc6-arm64-cross libc6-dev-arm64-cross wget file ca-certificates \
binutils-aarch64-linux-gnu \ binutils-aarch64-linux-gnu cmake \
&& \ && \
apt-get clean apt-get clean

View File

@ -6,7 +6,7 @@ RUN apt-get -y update && \
apt-get install -y --force-yes --no-install-recommends \ apt-get install -y --force-yes --no-install-recommends \
curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \ curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
libc6-dev-armhf-cross wget file ca-certificates \ libc6-dev-armhf-cross wget file ca-certificates \
binutils-arm-linux-gnueabihf \ binutils-arm-linux-gnueabihf cmake \
&& \ && \
apt-get clean apt-get clean

View File

@ -6,6 +6,7 @@ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
g++ \ g++ \
build-essential \ build-essential \
cmake \
curl \ curl \
git \ git \
file \ file \