Skip to content

Commit 750c841

Browse files
change solr endpoint name in bind_mount task
1 parent e486fdc commit 750c841

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

bin/dlc

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ bundle exec rake dcv:ci:config_files
44
echo "Updating config to use host.docker.internal"
55
bundle exec rake dcv:docker:bind_mount:use_docker_host
66

7-
echo "starting tunneled solr prod in background"
7+
echo "Starting Solr prod tunnel in background"
88
ssh -L 8983:ldpd-solr-prod1.cul.columbia.edu:8983 -C -N [email protected] &
99
echo $! > ./tmp/ssh_tunnel.pid
1010

11-
# (bin/solr_monitor.sh </dev/null > /dev/tty 2>/dev/tty) &
1211
MONITOR_FILE="./tmp/shutdown_tunnel_signal"
1312
PID_FILE="./tmp/ssh_tunnel.pid"
1413

config/templates/blacklight.template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ shared:
22
adapter: solr
33
timeout: 120
44
development:
5-
url: http://localhost:8983/solr/dlc
5+
url: http://localhost:8983/solr/dcv
66
adapter: solr
77
timeout: 120
88
test:

config/templates/solr.template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
development:
2-
url: http://localhost:8983/solr/dlc
2+
url: http://localhost:8983/solr/dcv
33
timeout: 120
44
test:
55
url: http://localhost:9983/solr/dcv

entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ trap cleanup SIGTERM
3232
#Execute command
3333
"${@}" &
3434

35-
#keep as main process so that sigterm triggers cleanup
35+
#keep as main process so that SIGTERM triggers cleanup
3636
wait $!

lib/tasks/dcv/docker.rake

+4-5
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,15 @@ namespace :dcv do
120120

121121
namespace :bind_mount do
122122
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|
125125
file_path = File.join(Rails.root, "config/#{file_name}.yml")
126126
app_yaml = YAML.load_file(file_path)
127127
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 }
129130
end
130131
end
131132
end
132-
133133
end
134134
end
135-

0 commit comments

Comments
 (0)