Skip to content

Commit

Permalink
Merge pull request #121 from clearmatics/dev
Browse files Browse the repository at this point in the history
Ion v2.0.0
  • Loading branch information
Shirikatsu authored Dec 10, 2018
2 parents f6d70b3 + 5ac69a0 commit c839eb7
Show file tree
Hide file tree
Showing 127 changed files with 13,618 additions and 9,413 deletions.
4 changes: 0 additions & 4 deletions .docker-build-requirements.txt

This file was deleted.

103 changes: 0 additions & 103 deletions .docker-entrypoint.sh

This file was deleted.

11 changes: 0 additions & 11 deletions .dockerignore

This file was deleted.

6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/build
/abi
/dist
/chaindata
/node_modules
Expand All @@ -11,8 +12,3 @@ docs/deps-modules.dot
*.log
*.pdf
*.egg-info/
lextab.py
yacctab.py
*.swp
*.swo
*.pid
7 changes: 0 additions & 7 deletions .solhint.json

This file was deleted.

53 changes: 43 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,43 @@
sudo: enabled
language: python
python:
- '3.6'
install:
- make requirements-dev requirements
script:
- make travis
git:
depth: 3
os: linux
dist: trusty

matrix:
include:
- name: "Javascript Contract Tests"
services:
- docker

before_script:
- npm install
- npm run testrpc &

script:
- npm run test

before_install:
- docker build . -t node
- docker run --name testrpc --rm -d -it -p 127.0.0.1:8501:8545 node bash
- docker exec -d -it testrpc /bin/bash ./docker_build/launch_geth.sh

- name: "Ion-CLI Tests"
language: go
go: 1.9.x
script:
- cd ./ion-cli
- go get github.com/ethereum/go-ethereum
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
- dep ensure
- cp -r "${GOPATH}/src/github.com/ethereum/go-ethereum/crypto/secp256k1/libsecp256k1" "vendor/github.com/ethereum/go-ethereum/crypto/secp256k1/"
- make build
- make test

before_install:
- sudo add-apt-repository ppa:ethereum/ethereum -y
- sudo apt-get update
- sudo apt-get install solc -y


notifications:
slack:
on_failure: always
secure: k6j6BWCTMJ6U7JXhy0yBcJpfkOw4eUNnL9xyufiI6Ue5Cf+NvN9FJxNZvoz4BvVSitq/BSlcWGjQoIW5AoWtf15tl4hvQmFN4YYHT79TKjRGEcSBg1+D55aXmjIM3UwHtCOuSJxAkl7dTgWAJ3FU0/aBqy96OsODjhcP8VeuMay+2Z+kT/QQjtO5rduHfLpeJxVfoEdhXR9QjHozV287rE49E6wWV6KzNCDOYy3CFGkQsgBQzlxkmlvhwbjDeNb72UcruSh50ic78/NLru3AXwRFx2yc1fkr2Nv9q6l5r9I1iWek8EZ46OCe/dQ004s7PI7knVx1vssdA3ksLDyRzhNHvWpn1EI1fi4Aqc+ki9vHbccR5c1pw85zwcQiLEoVFpJ+MpfHi9ExmAJmvvrzz2RBMqsL5JuSfInxiSLyX6vSVpufgZYrDKAemWXhR030dQQZ8BVQOCbt2lzCgHZajmDvrOktq6QdTFzEz/JjyorXn+0Rpho+7FHY5sW9KdgvmexI9SAjjz0BgcQzof9QKpyuRZpbboWRxPsfPUQDlx+Wxm541ndunGNQ2mVXqSgKaTQShiKhhu7dOPevw1a+dreJ6n8afL9pfW4SHcs0O+FlHvAnLAbRDvbnxROF89RRDiTVBdC6h7vcAX6lNDFUxF0F1bYTiWE0s4+umB2zlqc=
26 changes: 26 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM ubuntu:16.04

LABEL version="1.0"
LABEL maintainer="mgb@clearmatics.com"

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install --yes software-properties-common
RUN add-apt-repository ppa:ethereum/ethereum
RUN apt-get update && apt-get install --yes geth

RUN adduser --disabled-login --gecos "" eth_user

COPY docker_build /home/eth_user/docker_build
RUN chown -R eth_user:eth_user /home/eth_user/docker_build

USER eth_user

WORKDIR /home/eth_user

RUN geth --datadir docker_build/account/ init docker_build/clique.json

EXPOSE 8545

ENTRYPOINT bash

7 changes: 0 additions & 7 deletions Dockerfile.alpine-glibc

This file was deleted.

19 changes: 0 additions & 19 deletions Dockerfile.alpine-python

This file was deleted.

Loading

0 comments on commit c839eb7

Please sign in to comment.