diff --git a/.circleci/config.yml b/.circleci/config.yml index 01325b8b9d..c90be56eb3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,12 +19,12 @@ executors: builder: docker: - - image: omisegoimages/elixir-omg-builder:dev-a21824a + - image: omisegoimages/elixir-omg-builder:dev-85e4411 working_directory: ~/src builder_pg: docker: - - image: omisegoimages/elixir-omg-builder:dev-a21824a + - image: omisegoimages/elixir-omg-builder:dev-85e4411 - image: circleci/postgres:9.6-alpine environment: POSTGRES_USER: omisego_dev @@ -34,7 +34,7 @@ executors: builder_pg_geth: docker: - - image: omisegoimages/elixir-omg-tester:dev-a21824a + - image: omisegoimages/elixir-omg-tester:dev-85e4411 - image: circleci/postgres:9.6-alpine environment: POSTGRES_USER: omisego_dev @@ -44,7 +44,7 @@ executors: deployer: docker: - - image: omisegoimages/elixir-omg-deploy:dev-a21824a + - image: omisegoimages/elixir-omg-deploy:dev-85e4411 working_directory: ~/src commands: @@ -137,7 +137,7 @@ commands: - run: name: "Docker run <>" command: | - docker run --rm -it --network=chain_net -e DOCKER=true -e CHILD_CHAIN_URL=http://172.27.0.108:9656/v1 -e ETHEREUM_RPC_URL=http://172.27.0.108:80 -e DOCKER_GETH=true -e TEST_DATABASE_URL=postgresql://omisego_dev:omisego_dev@172.27.0.107:5432/omisego_test -e SHELL=/bin/sh -v $(pwd):/app --entrypoint /bin/sh omisegoimages/elixir-omg-builder:dev-a21824a -c "cd /app && mix deps.get && <>" + docker run --rm -it --network=chain_net -e DOCKER=true -e CHILD_CHAIN_URL=http://172.27.0.108:9656/v1 -e ETHEREUM_RPC_URL=http://172.27.0.108:80 -e DOCKER_GETH=true -e TEST_DATABASE_URL=postgresql://omisego_dev:omisego_dev@172.27.0.107:5432/omisego_test -e SHELL=/bin/sh -v $(pwd):/app --entrypoint /bin/sh omisegoimages/elixir-omg-builder:dev-85e4411 -c "cd /app && mix deps.get && <>" install_elixir: description: Installs elixir and checks if docker is healthy @@ -653,7 +653,7 @@ jobs: -e SHELL=/bin/sh \ -v $(pwd):/app \ --entrypoint /bin/sh \ - "omisego/childchain-builder:dev-a21824a" -c "cd /app/priv/cabbage && apk add maven && apk add jq && make install && make generate_api_code && mix deps.get && mix test ${TESTFILES} --trace" + "omisego/childchain-builder:dev-85e4411" -c "cd /app/priv/cabbage && apk add maven && apk add jq && make install && make generate_api_code && mix deps.get && mix test ${TESTFILES} --trace" - store_test_results: path: ~/project/priv/cabbage/_build/test/lib/itest/ - save_cache: @@ -812,7 +812,7 @@ jobs: -e REORG=true \ -v $(pwd):/app \ --entrypoint /bin/sh \ - "omisego/childchain-builder:dev-a21824a" -c "cd /app/priv/cabbage && apk add maven && apk add jq && make install && make generate_api_code && mix deps.get && mix test --only deposit --trace" + "omisego/childchain-builder:dev-85e4411" -c "cd /app/priv/cabbage && apk add maven && apk add jq && make install && make generate_api_code && mix deps.get && mix test --only deposit --trace" - save_cache: key: docker_compose_release-cabbage-{{ checksum "~/project/priv/cabbage/mix.lock" }} paths: @@ -1111,11 +1111,11 @@ workflows: filters: *all_branches_and_tags # - test_docker_compose_performance: # filters: *all_branches_and_tags - - test_docker_compose_reorg: - filters: - branches: - only: - - master-v2 + - test_docker_compose_reorg + # filters: + # branches: + # only: + # - master-v2 - audit_deps: requires: [build] filters: *all_branches_and_tags diff --git a/Dockerfile.watcher b/Dockerfile.watcher index c634f803b5..e4a18d234e 100644 --- a/Dockerfile.watcher +++ b/Dockerfile.watcher @@ -54,7 +54,7 @@ RUN set -xe \ #rocksdb from builder image to deployer image RUN mkdir -p /usr/local/rocksdb/lib RUN mkdir /usr/local/rocksdb/include -COPY --from=omisegoimages/elixir-omg-builder:dev-a21824a /usr/local/rocksdb/ /usr/local/rocksdb/ +COPY --from=omisegoimages/elixir-omg-builder:dev-85e4411 /usr/local/rocksdb/ /usr/local/rocksdb/ ARG release_version ADD _build_docker/prod/watcher-${release_version}.tar.gz /app diff --git a/Dockerfile.watcher_info b/Dockerfile.watcher_info index 17935b09ad..ca3fd1e149 100644 --- a/Dockerfile.watcher_info +++ b/Dockerfile.watcher_info @@ -54,7 +54,7 @@ RUN set -xe \ #rocksdb from builder image to deployer image RUN mkdir -p /usr/local/rocksdb/lib RUN mkdir /usr/local/rocksdb/include -COPY --from=omisegoimages/elixir-omg-builder:dev-a21824a /usr/local/rocksdb/ /usr/local/rocksdb/ +COPY --from=omisegoimages/elixir-omg-builder:dev-85e4411 /usr/local/rocksdb/ /usr/local/rocksdb/ ARG release_version ADD _build_docker/prod/watcher_info-${release_version}.tar.gz /app diff --git a/Makefile b/Makefile index 6c72971e5a..90d1fd4698 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ all: clean build-watcher-prod build-watcher_info-prod WATCHER_IMAGE_NAME ?= "omisego/watcher-v2:latest" WATCHER_INFO_IMAGE_NAME ?= "omisego/watcher_info-v2:latest" -IMAGE_BUILDER ?= "omisegoimages/elixir-omg-builder:dev-a21824a" +IMAGE_BUILDER ?= "omisegoimages/elixir-omg-builder:dev-85e4411" IMAGE_BUILD_DIR ?= $(PWD) ENV_DEV ?= env MIX_ENV=dev diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 4bf629f86f..065afac7bc 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,7 +1,7 @@ version: "2.3" services: elixir-omg: - image: omisegoimages/elixir-omg-builder:dev-a21824a + image: omisegoimages/elixir-omg-builder:dev-85e4411 environment: DATABASE_URL: postgres://omisegodev:omisegodev@postgres:5432/omisego_dev TEST_DATABASE_URL: postgres://omisegodev:omisegodev@postgres:5432/omisego_test diff --git a/snapshot_reorg.env b/snapshot_reorg.env index e2a71aa7da..f703ddae91 100644 --- a/snapshot_reorg.env +++ b/snapshot_reorg.env @@ -1,2 +1,2 @@ -SNAPSHOT=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-dev-a21824a-MIN_EXIT_PERIOD-120-PLASMA_CONTRACTS_SHA--reorg.tar.gz +SNAPSHOT=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-dev-85e4411-MIN_EXIT_PERIOD-120-PLASMA_CONTRACTS_SHA--reorg.tar.gz CONTRACT_SHA=5d29c432e9b55ae2c7ec7a06a5e66761eca7ab28 diff --git a/snapshots.env b/snapshots.env index 6d594130aa..8b15ff6784 100644 --- a/snapshots.env +++ b/snapshots.env @@ -1,5 +1,5 @@ -SNAPSHOT_MIN_EXIT_PERIOD_SECONDS_20=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-dev-a21824a-MIN_EXIT_PERIOD-20-PLASMA_CONTRACTS_SHA-5d29c432e9b55ae2c7ec7a06a5e66761eca7ab28-VAULT-false.tar.gz -SNAPSHOT_MIN_EXIT_PERIOD_SECONDS_120=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-dev-a21824a-MIN_EXIT_PERIOD-120-PLASMA_CONTRACTS_SHA-5d29c432e9b55ae2c7ec7a06a5e66761eca7ab28-VAULT-false.tar.gz -VAULT_SNAPSHOT_MIN_EXIT_PERIOD_SECONDS_20=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-dev-a21824a-MIN_EXIT_PERIOD-20-PLASMA_CONTRACTS_SHA-5d29c432e9b55ae2c7ec7a06a5e66761eca7ab28-VAULT-true.tar.gz -VAULT_SNAPSHOT_MIN_EXIT_PERIOD_SECONDS_120=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-dev-a21824a-MIN_EXIT_PERIOD-120-PLASMA_CONTRACTS_SHA-5d29c432e9b55ae2c7ec7a06a5e66761eca7ab28-VAULT-true.tar.gz +SNAPSHOT_MIN_EXIT_PERIOD_SECONDS_20=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-dev-85e4411-MIN_EXIT_PERIOD-20-PLASMA_CONTRACTS_SHA-5d29c432e9b55ae2c7ec7a06a5e66761eca7ab28-VAULT-false.tar.gz +SNAPSHOT_MIN_EXIT_PERIOD_SECONDS_120=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-dev-85e4411-MIN_EXIT_PERIOD-120-PLASMA_CONTRACTS_SHA-5d29c432e9b55ae2c7ec7a06a5e66761eca7ab28-VAULT-false.tar.gz +VAULT_SNAPSHOT_MIN_EXIT_PERIOD_SECONDS_20=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-dev-85e4411-MIN_EXIT_PERIOD-20-PLASMA_CONTRACTS_SHA-5d29c432e9b55ae2c7ec7a06a5e66761eca7ab28-VAULT-true.tar.gz +VAULT_SNAPSHOT_MIN_EXIT_PERIOD_SECONDS_120=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-dev-85e4411-MIN_EXIT_PERIOD-120-PLASMA_CONTRACTS_SHA-5d29c432e9b55ae2c7ec7a06a5e66761eca7ab28-VAULT-true.tar.gz CONTRACT_SHA=5d29c432e9b55ae2c7ec7a06a5e66761eca7ab28