Backports for beta 2.1.2 (#9649)

* parity-version: bump beta to 2.1.2 * docs(rpc): push the branch along with tags (#9578) * docs(rpc): push the branch along with tags * ci: remove old rpc docs script * Remove snapcraft clean (#9585) * Revert " add snapcraft package image (master) (#9584)" This reverts commit ceaedbbd7f. * Update package-snap.sh * Update .gitlab-ci.yml * ci: fix regex 🙄 (#9597) * docs(rpc): annotate tag with the provided message (#9601) * Update ropsten.json (#9602) * HF in POA Sokol (2018-09-19) (#9607) https://github.com/poanetwork/poa-chain-spec/pull/86 * fix(network): don't disconnect reserved peers (#9608) The priority of && and || was borked. * fix failing node-table tests on mac os, closes #9632 (#9633) * ethcore-io retries failed work steal (#9651) * ethcore-io uses newer version of crossbeam && retries failed work steal * ethcore-io non-mio service uses newer crossbeam * remove master from releasable branches (#9655) * remove master from releasable branches need backporting in beta fix https://gitlab.parity.io/parity/parity-ethereum/-/jobs/101065 etc * add except for snap packages for master * Test fix for windows cache name... (#9658) * Test fix for windows cache name... * Fix variable name. * fix(light_fetch): avoid race with BlockNumber::Latest (#9665) * Calculate sha3 instead of sha256 for push-release. (#9673) * Calculate sha3 instead of sha256 for push-release. * Add pushes to the script. * Hardfork the testnets (#9562) * ethcore: propose hardfork block number 4230000 for ropsten * ethcore: propose hardfork block number 9000000 for kovan * ethcore: enable kip-4 and kip-6 on kovan * etcore: bump kovan hardfork to block 9.2M * ethcore: fix ropsten constantinople block number to 4.2M * ethcore: disable difficulty_test_ropsten until ethereum/tests are updated upstream * ci: fix push script (#9679) * ci: fix push script * Fix copying & running on windows. * CI: Remove unnecessary pipes (#9681) * ci: reduce gitlab pipelines significantly * ci: build pipeline for PR * ci: remove dead weight * ci: remove github release script * ci: remove forever broken aura tests * ci: add random stuff to the end of the pipes * ci: add wind and mac to the end of the pipe * ci: remove snap artifacts * ci: (re)move dockerfiles * ci: clarify job names * ci: add cargo audit job * ci: make audit script executable * ci: ignore snap and docker files for rust check * ci: simplify audit script * ci: rename misc to optional * ci: add publish script to releaseable branches * ci: more verbose cp command for windows build * ci: fix weird binary checksum logic in push script * ci: fix regex in push script for windows * ci: simplify gitlab caching * docs: align README with ci changes * ci: specify default cargo target dir * ci: print verbose environment * ci: proper naming of scripts * ci: restore docker files * ci: use docker hub file * ci: use cargo home instead of cargo target dir * ci: touch random rust file to trigger real builds * ci: set cargo target dir for audit script * ci: remove temp file * ci: don't export the cargo target dir in the audit script * ci: fix windows unbound variable * docs: fix gitlab badge path * rename deprecated gitlab ci variables https://docs.gitlab.com/ee/ci/variables/#9-0-renaming * ci: fix git compare for nightly builds * test: skip c++ example for all platforms but linux * ci: add random rust file to trigger tests * ci: remove random rust file * disable cpp lib test for mac, win and beta (#9686) * cleanup ci merge * ci: fix tests * fix bad-block reporting no reason (#9638) * ethcore: fix detection of major import (#9552) * sync: set state to idle after sync is completed * sync: refactor sync reset * Don't hash the init_code of CREATE. (#9688) * Docker: run as parity user (#9689) * Implement CREATE2 gas changes and fix some potential overflowing (#9694) * Implement CREATE2 gas changes and fix some potential overflowing * Ignore create2 state tests * Split CREATE and CREATE2 in gasometer * Generalize rounding (x + 31) / 32 to to_word_size * make instantSeal engine backwards compatible, closes #9696 (#9700) * ethcore: delay ropsten hardfork (#9704) * fix (light/provider) : Make `read_only executions` read-only (#9591) * `ExecutionsRequest` from light-clients as read-only This changes so all `ExecutionRequests` from light-clients are executed as read-only which the `virtual``flag == true ensures. This boost up the current transaction to always succeed Note, this only affects `eth_estimateGas` and `eth_call` AFAIK. * grumbles(revert renaming) : TransactionProof * grumbles(trace) : remove incorrect trace * grumbles(state/prove_tx) : explicit `virt` Remove the boolean flag to determine that a `state::prove_transaction` whether it should be executed in a virtual context or not. Because of that also rename the function to `state::prove_transction_virtual` to make more clear * CI: Skip docs job for nightly (#9693) * ci: force-tag wiki changes * ci: force-tag wiki changes * ci: skip docs job for master and nightly * ci: revert docs job checking for nightly tag * ci: exclude docs job from nightly builds in gitlab script
2018-10-09 15:04:30 +02:00
parent 8e347b2602
commit 52fe28a052
65 changed files with 967 additions and 1008 deletions
--- a/scripts/docker/README.md
+++ b/scripts/docker/README.md
@@ -0,0 +1,40 @@
+## Usage
+
+```docker build -f docker/ubuntu/Dockerfile --tag ethcore/parity:branch_or_tag_name .```
+
+## Usage - CentOS
+
+Builds a lightweight non-root Parity docker image:
+```
+git clone https://github.com/paritytech/parity-ethereum.git
+cd parity-ethereum
+./docker/centos/build.sh
+```
+
+Fully customised build:
+```
+PARITY_IMAGE_REPO=my-personal/parity \
+PARITY_BUILDER_IMAGE_TAG=build-latest \
+PARITY_RUNNER_IMAGE_TAG=centos-parity-experimental \
+./docker/centos/build.sh
+```
+
+Default values:
+```
+# The image name
+PARITY_IMAGE_REPO - parity/parity
+
+# The tag to be used for builder image, git commit sha will be appended
+PARITY_BUILDER_IMAGE_TAG - build
+
+# The tag to be used for runner image
+PARITY_RUNNER_IMAGE_TAG - latest
+```
+
+All default ports you might use will be exposed:
+```
+#           secret
+#      ipfs store     ui   rpc  ws   listener  discovery
+#      ↓    ↓         ↓    ↓    ↓    ↓         ↓
+EXPOSE 5001 8082 8083 8180 8545 8546 30303/tcp 30303/udp
+```
--- a/scripts/docker/alpine/Dockerfile
+++ b/scripts/docker/alpine/Dockerfile
@@ -0,0 +1,43 @@
+FROM alpine:edge AS builder
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+RUN apk add --no-cache \
+  build-base \
+  cargo \
+  cmake \
+  eudev-dev \
+  linux-headers \
+  perl \
+  rust
+
+WORKDIR /parity
+COPY . /parity
+RUN cargo build --release --target x86_64-alpine-linux-musl --verbose
+RUN strip target/x86_64-alpine-linux-musl/release/parity
+
+
+FROM alpine:edge
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+RUN apk add --no-cache \
+  libstdc++ \
+  eudev-libs \
+  libgcc
+
+RUN addgroup -g 1000 parity \
+  && adduser -u 1000 -G parity -s /bin/sh -D parity
+
+USER parity
+
+EXPOSE 8080 8545 8180
+
+WORKDIR /home/parity
+
+RUN mkdir -p /home/parity/.local/share/io.parity.ethereum/
+COPY --chown=parity:parity --from=builder /parity/target/x86_64-alpine-linux-musl/release/parity ./
+
+ENTRYPOINT ["./parity"]
--- a/scripts/docker/centos/Dockerfile
+++ b/scripts/docker/centos/Dockerfile
@@ -0,0 +1,28 @@
+FROM centos:latest
+
+RUN mkdir -p /opt/parity/data && \
+    chmod g+rwX /opt/parity/data && \
+    mkdir -p /opt/parity/release
+
+COPY parity/parity /opt/parity/release
+
+WORKDIR /opt/parity/data
+
+# exposing default ports
+#
+#           secret
+#      ipfs store     ui   rpc  ws   listener  discovery
+#      ↓    ↓         ↓    ↓    ↓    ↓         ↓
+EXPOSE 5001 8082 8083 8180 8545 8546 30303/tcp 30303/udp
+
+# switch to non-root user
+USER 1001
+
+#if no base path provided, assume it's current workdir
+CMD ["--base-path","."]
+ENTRYPOINT ["/opt/parity/release/parity"]  
+
+
+   
+
+
--- a/scripts/docker/centos/Dockerfile.build
+++ b/scripts/docker/centos/Dockerfile.build
@@ -0,0 +1,25 @@
+FROM centos:latest
+
+WORKDIR /build
+
+ADD . /build/parity-ethereum
+
+RUN yum -y update && \
+    yum install -y systemd-devel git make gcc-c++ gcc file binutils && \
+    curl -L "https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.tar.gz" -o cmake.tar.gz && \
+    tar -xzf cmake.tar.gz && \
+    cp -r cmake-3.12.0-Linux-x86_64/* /usr/ && \
+    curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+    PATH=/root/.cargo/bin:$PATH && \
+    RUST_BACKTRACE=1 && \
+    rustc -vV && \
+    cargo -V && \
+    gcc -v && \
+    g++ -v && \
+    cmake --version && \
+    cd parity-ethereum && \
+    cargo build --verbose --release --features final && \
+    strip /build/parity-ethereum/target/release/parity && \
+    file /build/parity-ethereum/target/release/parity
+
+
--- a/scripts/docker/centos/build.sh
+++ b/scripts/docker/centos/build.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+
+# The image name
+PARITY_IMAGE_REPO=${PARITY_IMAGE_REPO:-parity/parity}
+# The tag to be used for builder image
+PARITY_BUILDER_IMAGE_TAG=${PARITY_BUILDER_IMAGE_TAG:-build}
+# The tag to be used for runner image
+PARITY_RUNNER_IMAGE_TAG=${PARITY_RUNNER_IMAGE_TAG:-latest}
+
+echo Building $PARITY_IMAGE_REPO:$PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H")
+docker build --no-cache -t $PARITY_IMAGE_REPO:$PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H") . -f docker/centos/Dockerfile.build
+
+echo Creating $PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H"), extracting binary
+docker create --name extract $PARITY_IMAGE_REPO:$PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H") 
+mkdir docker/centos/parity
+docker cp extract:/build/parity-ethereum/target/release/parity docker/centos/parity
+
+echo Building $PARITY_IMAGE_REPO:$PARITY_RUNNER_IMAGE_TAG
+docker build --no-cache -t $PARITY_IMAGE_REPO:$PARITY_RUNNER_IMAGE_TAG docker/centos/ -f docker/centos/Dockerfile
+
+echo Cleaning up ...
+rm -rf docker/centos/parity
+docker rm -f extract
+docker rmi -f $PARITY_IMAGE_REPO:$PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H")
+
+echo Echoing Parity version:
+docker run $PARITY_IMAGE_REPO:$PARITY_RUNNER_IMAGE_TAG --version
+
+echo Done.
--- a/scripts/docker/hub/Dockerfile
+++ b/scripts/docker/hub/Dockerfile
@@ -0,0 +1,36 @@
+FROM ubuntu:xenial
+MAINTAINER Parity Technologies <devops@parity.io>
+#set ENVIROMENT
+ARG TARGET
+ENV TARGET ${TARGET}
+
+# install tools and dependencies
+RUN apt update && apt install -y --no-install-recommends openssl libudev-dev file
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+#cleanup Docker image
+RUN apt autoremove -y
+RUN apt clean -y
+RUN rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
+
+RUN groupadd -g 1000 parity \
+  && useradd -m -u 1000 -g parity -s /bin/sh parity
+
+USER parity
+
+WORKDIR /home/parity
+
+ENV PATH "~/bin:${PATH}"
+
+#add TARGET to docker image
+COPY artifacts/x86_64-unknown-linux-gnu/$TARGET ./bin/$TARGET
+
+# Build a shell script because the ENTRYPOINT command doesn't like using ENV
+RUN echo "#!/bin/bash \n ${TARGET} \$@" > ./entrypoint.sh
+RUN chmod +x ./entrypoint.sh
+
+# setup ENTRYPOINT
+EXPOSE 5001 8080 8082 8083 8545 8546 8180 30303/tcp 30303/udp
+ENTRYPOINT ["./entrypoint.sh"]
--- a/scripts/docker/ubuntu-aarch64/Dockerfile
+++ b/scripts/docker/ubuntu-aarch64/Dockerfile
@@ -0,0 +1,45 @@
+FROM ubuntu:14.04
+WORKDIR /build
+
+# install tools and dependencies
+RUN apt-get -y update && \
+        apt-get install -y --force-yes --no-install-recommends \
+        curl git make g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
+        libc6-arm64-cross libc6-dev-arm64-cross wget file ca-certificates \
+        binutils-aarch64-linux-gnu cmake3 libudev-dev \
+        && \
+    apt-get clean
+
+# install rustup
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# rustup directory
+ENV PATH /root/.cargo/bin:$PATH
+
+ENV RUST_TARGETS="aarch64-unknown-linux-gnu"
+
+# multirust add arm--linux-gnuabhf toolchain
+RUN rustup target add aarch64-unknown-linux-gnu
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# show tools
+RUN rustc -vV && cargo -V
+
+# build parity
+ADD . /build/parity
+RUN cd parity && \
+        mkdir -p .cargo && \
+        echo '[target.aarch64-unknown-linux-gnu]\n\
+        linker = "aarch64-linux-gnu-gcc"\n'\
+        >>.cargo/config && \
+        cat .cargo/config && \
+        cargo build --target aarch64-unknown-linux-gnu --release --verbose && \
+        ls /build/parity/target/aarch64-unknown-linux-gnu/release/parity &&     \
+        /usr/bin/aarch64-linux-gnu-strip /build/parity/target/aarch64-unknown-linux-gnu/release/parity
+
+RUN file /build/parity/target/aarch64-unknown-linux-gnu/release/parity
+
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/build/parity/target/aarch64-unknown-linux-gnu/release/parity"]
--- a/scripts/docker/ubuntu-arm/Dockerfile
+++ b/scripts/docker/ubuntu-arm/Dockerfile
@@ -0,0 +1,45 @@
+FROM ubuntu:14.04
+WORKDIR /build
+
+# install tools and dependencies
+RUN apt-get -y update && \
+        apt-get install -y --force-yes --no-install-recommends \
+        curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
+        libc6-dev-armhf-cross wget file ca-certificates \
+        binutils-arm-linux-gnueabihf cmake3 libudev-dev \
+        && \
+    apt-get clean
+
+# install rustup
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# rustup directory
+ENV PATH /root/.cargo/bin:$PATH
+
+ENV RUST_TARGETS="arm-unknown-linux-gnueabihf"
+
+# multirust add arm--linux-gnuabhf toolchain
+RUN rustup target add armv7-unknown-linux-gnueabihf
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# show tools
+RUN rustc -vV && cargo -V
+
+# build parity
+ADD . /build/parity
+RUN cd parity && \
+        mkdir -p .cargo && \
+        echo '[target.armv7-unknown-linux-gnueabihf]\n\
+        linker = "arm-linux-gnueabihf-gcc"\n'\
+        >>.cargo/config && \
+        cat .cargo/config && \
+        cargo build --target armv7-unknown-linux-gnueabihf --release --verbose && \
+        ls /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity && \
+        /usr/bin/arm-linux-gnueabihf-strip /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
+
+RUN file /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
+
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/build/parity/target/armv7-unknown-linux-gnueabihf/release/parity"]