Skip to content

Commit

Permalink
move config file setup to entrypoint.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
JackBlackLight committed Jan 17, 2025
1 parent 09b0542 commit b7b4634
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
11 changes: 5 additions & 6 deletions bin/dlc
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
echo "Configuring files ..."
bundle exec rake dcv:ci:config_files

echo "Updating config to use host.docker.internal"
bundle exec rake dcv:docker:bind_mount:use_docker_host

echo "Starting Solr prod tunnel in background"
ssh -L 8983:ldpd-solr-prod1.cul.columbia.edu:8983 -C -N [email protected] &

if [ ! -d "./tmp" ]; then
mkdir -p "./tmp"
fi

echo $! > ./tmp/ssh_tunnel.pid

MONITOR_FILE="./tmp/shutdown_tunnel_signal"
Expand Down
6 changes: 6 additions & 0 deletions docker/bind_mount/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ trap cleanup SIGINT SIGTERM
# Remove a potentially pre-existing server.pid for Rails.
rm -f ./tmp/pids/server.pid

echo "Configuring files ..."
bundle exec rake dcv:ci:config_files

echo "Updating config to use host.docker.internal"
bundle exec rake dcv:docker:bind_mount:use_docker_host

# shakapacker has no promptless option without overwriting, so we preserve and restore existing config
echo "Checking shakapacker installation..."
cp config/shakapacker.yml config/shakapacker.yml.dlc
Expand Down

0 comments on commit b7b4634

Please sign in to comment.