diff options
| author |   Yuli Shlosberg <ys9693@att.com> | 2018-07-08 11:50:54 +0300 |
|---|---|---|
| committer | Yuli Shlosberg <ys9693@att.com> | 2018-07-10 11:16:12 +0300 |
| commit | b96e0da8bae19842b4eab733885775cdbfbf59fa (patch) | |
| tree | a10900027cbc0b45ed9e631d34794cf5a8aa5c2a /utils/webseal-simulator | |
| parent | 47db64bab2f9555e9e2c7da243d6e0ddcbda4fd8 (diff) | |
update dockers base version to 1.4.0
Change-Id: I6c2490ade7ff3071487be5c0e783060390e2a2f1
Issue-ID: SDC-1344
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
Diffstat (limited to 'utils/webseal-simulator')
| -rw-r--r-- | utils/webseal-simulator/sdc-simulator/Dockerfile | 2 | ||||
| -rw-r--r-- | utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile index 5b115530e7..ca74a81484 100644 --- a/utils/webseal-simulator/sdc-simulator/Dockerfile +++ b/utils/webseal-simulator/sdc-simulator/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-jetty:1.3.1 +FROM onap/base_sdc-jetty:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb index 17ed3482bb..9df4b0af6e 100644 --- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb +++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb @@ -1,6 +1,6 @@ jetty_base="/var/lib/jetty" -if !ENV['FE_URL'].empty? +if ENV['FE_URL'] fe_url="#{ENV['FE_URL']}" elsif node['disableHttp'] fe_url="https://#{node['Nodes']['FE']}:#{node['FE'][:https_port]}" |