diff --git a/dev.yml b/dev.yml index 2dfd802fa..1f93945a2 100644 --- a/dev.yml +++ b/dev.yml @@ -9,12 +9,14 @@ up: - sqlite - ruby - isogun + - nginx + - redis + - mysql - bundler: without: ci server: root: test/dummy - port: 55330 commands: bootstrap: bin/bootstrap shopify diff --git a/isogun.yml b/isogun.yml deleted file mode 100644 index 99a7b315a..000000000 --- a/isogun.yml +++ /dev/null @@ -1,15 +0,0 @@ -# https://dev-accel.shopify.io/dev/railgun/Railgun-Config -name: shipit-engine - -vm: - ip_address: 192.168.64.85 - memory: 2G - cores: 2 - -services: - - redis - - nginx - - mysql - -hostnames: - - shipit-engine.myshopify.io: { proxy_to_host_port: 55330 } diff --git a/lib/shipit.rb b/lib/shipit.rb index 1a32d9a4b..a5387e2ed 100644 --- a/lib/shipit.rb +++ b/lib/shipit.rb @@ -96,7 +96,7 @@ def app_name end def redis_url - secrets.redis_url.present? ? URI(secrets.redis_url) : nil + secrets.redis_url.present? ? URI(secrets.redis_url) : ENV["REDIS_URL"] end def redis diff --git a/test/unit/shipit_test.rb b/test/unit/shipit_test.rb index 92946ebc3..a85c851fb 100644 --- a/test/unit/shipit_test.rb +++ b/test/unit/shipit_test.rb @@ -43,7 +43,7 @@ class RedisTest < self test ".redis should build a new redis client" do Redis.expects(:new).with( has_entries( - url: "redis://127.0.0.1:6379/7", + url: Shipit.redis_url.to_s, reconnect_attempts: 3, reconnect_delay: 0.5, reconnect_delay_max: 1