Skip to content

Commit

Permalink
network name, config fix for watcher security, db flags
Browse files Browse the repository at this point in the history
  • Loading branch information
InoMurko committed Mar 22, 2021
1 parent 40dd340 commit bf7816e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ commands:
- run:
name: "Docker run <<parameters.test_name>>"
command: |
docker run --rm -it --network=project_chain_net -e DOCKER=true -e CHILD_CHAIN_URL=http://172.27.0.108:9656/ -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:stable-20201207 -c "cd /app && mix deps.get && <<parameters.test_command>>"
docker run --rm -it --network=chain_net -e DOCKER=true -e CHILD_CHAIN_URL=http://172.27.0.108:9656/ -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:stable-20201207 -c "cd /app && mix deps.get && <<parameters.test_command>>"
install_elixir:
description: Installs elixir and checks if docker is healthy
Expand Down
2 changes: 1 addition & 1 deletion apps/omg_db/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ defmodule OMG.DB.MixProject do

defp deps() do
[
{:rocksdb, "~> 1.6", system_env: [{"ERLANG_ROCKSDB_OPTS", "-DWITH_SYSTEM_ROCKSDB=ON"}]},
{:rocksdb, "~> 1.6", system_env: [{"ERLANG_ROCKSDB_OPTS", "-DWITH_SYSTEM_ROCKSDB=ON -DPORTABLE=1 PORTABLE=1"}]},
{:omg_status, in_umbrella: true},
# NOTE: we only need in :dev and :test here, but we need in :prod too in performance
# then there's some unexpected behavior of mix that won't allow to mix these, see
Expand Down
9 changes: 9 additions & 0 deletions config/releases.exs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ import Config
# third argument is if this is a watcher info resolver
# fourth argument is whether this is a watcher info specific configuration
mandatory = fn
env_var_name, _exception, false, true ->
# this case covers a watcher info setting
# under watcher security application
# it's ok if the env var is missing
case System.get_env(env_var_name) do
nil -> "WATCHER_INFO_SETTING"
data -> data
end

env_var_name, exception, true, true ->
case System.get_env(env_var_name) do
nil -> throw(exception)
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ services:

networks:
chain_net:
name: chain_net
driver: bridge
ipam:
config:
Expand Down

0 comments on commit bf7816e

Please sign in to comment.