Skip to content

Commit

Permalink
Merge pull request #506 from kinvolk/pg-version
Browse files Browse the repository at this point in the history
Makefile, backend: Fix pg-version pin
  • Loading branch information
joaquimrocha authored Nov 4, 2021
2 parents 1b9e39c + f1db70e commit ba74b5e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ container_id:
./tools/setup_local_db.sh \
--id-file container_id.tmp \
--db-name nebraska_tests \
--password nebraska
--pg_version 13.3
--password nebraska \
--pg-version 13.3
cd backend && mv container_id.tmp container_id

.PHONY: check-backend-with-container
Expand Down
7 changes: 4 additions & 3 deletions backend/tools/setup_local_db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
# -f is --id-file
# -n is --db-name
# -P is --port
# -d is --pg-version
#
# After being finished with the database, do:
#
Expand All @@ -45,8 +46,8 @@ function fail() {

opts=$(getopt \
--name "$(basename "${0}")" \
--options 'f:n:p:P:' \
--longoptions 'id-file:,db-name:,password:,port:' \
--options 'f:n:p:P:d:' \
--longoptions 'id-file:,db-name:,password:,port:,pg-version:' \
-- "${@}"
)

Expand Down Expand Up @@ -80,7 +81,7 @@ while true; do
port="${2}"
shift 2
;;
'-d'|'--pg_version')
'-d'|'--pg-version')
pg_version="${2}"
shift 2
;;
Expand Down

0 comments on commit ba74b5e

Please sign in to comment.