Skip to content

Commit

Permalink
fix: add env subs for api ip and port
Browse files Browse the repository at this point in the history
  • Loading branch information
bilbercode authored and jakekeeys committed Sep 22, 2018
1 parent f9fc3d6 commit 0d8e26e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
10 changes: 2 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
FROM rails:latest



ARG GITHUB_TOKEN

RUN git config --global url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/".insteadOf "https://github.com/"


RUN apt-get update && apt-get install -y -q git

RUN gem install rdoc bundle

RUN mkdir /build

WORKDIR /build
RUN git clone https://github.com/utilitywarehouse/genieacs-gui.git
WORKDIR /build/genieacs-gui


WORKDIR /build/genieacs-gui
RUN cp config/graphs-sample.json.erb config/graphs.json.erb
RUN cp config/index_parameters-sample.yml config/index_parameters.yml
RUN cp config/summary_parameters-sample.yml config/summary_parameters.yml
Expand Down
4 changes: 2 additions & 2 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
config.file_watcher = ActiveSupport::EventedFileUpdateChecker

# GenieACS API
config.genieacs_api_host = 'localhost'
config.genieacs_api_port = 7557
config.genieacs_api_host = ENV['GENIEACS_NBI_IP']
config.genieacs_api_port = ENV['GENIEACS_NBI_PORT']
config.genieacs_api_use_ssl = false
end
4 changes: 2 additions & 2 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
config.active_record.dump_schema_after_migration = false

# GenieACS API
config.genieacs_api_host = 'localhost'
config.genieacs_api_port = 7557
config.genieacs_api_host = ENV['GENIEACS_NBI_IP']
config.genieacs_api_port = ENV['GENIEACS_NBI_PORT']
config.genieacs_api_use_ssl = false
end
4 changes: 2 additions & 2 deletions config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# config.action_view.raise_on_missing_translations = true

# GenieACS API
config.genieacs_api_host = 'localhost'
config.genieacs_api_port = 7557
config.genieacs_api_host = ENV['GENIEACS_NBI_IP']
config.genieacs_api_port = ENV['GENIEACS_NBI_PORT']
config.genieacs_api_use_ssl = false
end

0 comments on commit 0d8e26e

Please sign in to comment.