File tree 5 files changed +8
-10
lines changed
5 files changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -4,11 +4,10 @@ bundle exec rake dcv:ci:config_files
4
4
echo "Updating config to use host.docker.internal"
5
5
bundle exec rake dcv:docker:bind_mount:use_docker_host
6
6
7
- echo "starting tunneled solr prod in background"
7
+ echo "Starting Solr prod tunnel in background"
8
8
ssh -L 8983:ldpd-solr-prod1.cul.columbia.edu:8983 -C -N
[email protected] &
9
9
echo $! > ./tmp/ssh_tunnel.pid
10
10
11
- # (bin/solr_monitor.sh </dev/null > /dev/tty 2>/dev/tty) &
12
11
MONITOR_FILE="./tmp/shutdown_tunnel_signal"
13
12
PID_FILE="./tmp/ssh_tunnel.pid"
14
13
Original file line number Diff line number Diff line change 2
2
adapter : solr
3
3
timeout : 120
4
4
development :
5
- url : http://localhost:8983/solr/dlc
5
+ url : http://localhost:8983/solr/dcv
6
6
adapter : solr
7
7
timeout : 120
8
8
test :
Original file line number Diff line number Diff line change 1
1
development :
2
- url : http://localhost:8983/solr/dlc
2
+ url : http://localhost:8983/solr/dcv
3
3
timeout : 120
4
4
test :
5
5
url : http://localhost:9983/solr/dcv
Original file line number Diff line number Diff line change @@ -32,5 +32,5 @@ trap cleanup SIGTERM
32
32
# Execute command
33
33
" ${@ } " &
34
34
35
- # keep as main process so that sigterm triggers cleanup
35
+ # keep as main process so that SIGTERM triggers cleanup
36
36
wait $!
Original file line number Diff line number Diff line change @@ -120,16 +120,15 @@ namespace :dcv do
120
120
121
121
namespace :bind_mount do
122
122
task use_docker_host : :environment do
123
- config_files = [ ' blacklight' , ' solr' ]
124
- config_files . each do | file_name |
123
+ config_files = %w[ blacklight solr ]
124
+ config_files . each do |file_name |
125
125
file_path = File . join ( Rails . root , "config/#{ file_name } .yml" )
126
126
app_yaml = YAML . load_file ( file_path )
127
127
app_yaml [ 'development' ] [ 'url' ] . gsub! ( 'localhost' , 'host.docker.internal' )
128
- File . open ( file_path , 'w' ) { |f | f . write app_yaml . to_yaml }
128
+ app_yaml [ 'development' ] [ 'url' ] . gsub! ( 'dcv' , 'dlc' )
129
+ File . open ( file_path , 'w' ) { |f | f . write app_yaml . to_yaml }
129
130
end
130
131
end
131
132
end
132
-
133
133
end
134
134
end
135
-
You can’t perform that action at this time.
0 commit comments