diff --git a/.gitignore b/.gitignore index d79995fec..2231fe033 100755 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ .vscode *.log *.pem -dump.sql +*.sql passenger.*.pid *.tsbuildinfo *.pid.lock diff --git a/local_setup_instructions.sh b/local_setup_instructions.sh index 6420b6bea..a4d2c9380 100644 --- a/local_setup_instructions.sh +++ b/local_setup_instructions.sh @@ -101,10 +101,13 @@ sudo docker compose up # Create a database backup (this will overwrite dump.sql!) # If you do not do this before `git pull`, you will need to `git reset` first. sudo docker compose exec db pg_dumpall -U postgres > dump.sql - # Create a backup of the dump.sql file + # Create a backup of the dump.sql file. This will be gitignored + # or stashed in the next step to not interfere with the git pull later. cp -vi dump.sql dump_$(date +%Y%m%d%H%M%S).sql + # Stage and stash to avoid conflicts with the `git pull`. Stage: git add . - git stash save "dump.sql backup" + # And stash. Any output from this command is fine. + git stash save "pre-upgrade" # Shut down the server again to stop the database service sudo docker compose down # Stop and remove containers