Merge branch 'feature/docker-update' into develop

neo4reo · Aug 17, 2017 · 13889d4 · 13889d4
2 parents 3117358 + 5c16d4d
commit 13889d4
Show file tree

Hide file tree

Showing 25 changed files with 225 additions and 580 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,19 +4,14 @@ jobs:
     # must be IROHA_HOME:
     working_directory: /opt/iroha
     docker:
-      - image: lebdron/iroha-dev
+      - image: hyperledger/iroha-docker-develop
         environment:
           IROHA_HOME: /opt/iroha
           IROHA_BUILD: /tmp/build
       - image: postgres:9.5
       - image: redis:3.2.8
     steps:
       - checkout
-
-      - run:
-          name: deps install
-          command:  apt update &&  apt install curl -y
-
       - run:
           name: ensure, required folders created
           command: |

diff --git a/config/README.md b/config/README.md
diff --git a/config/bootstrap_environment.sh b/config/bootstrap_environment.sh
diff --git a/config/config.json b/config/config.json
diff --git a/docker/README.md b/docker/README.md
diff --git a/docker/build.sh b/docker/build.sh
diff --git a/docker/build_in_docker.sh b/docker/build_in_docker.sh
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile