Merge remote-tracking branch 'upstream/pull/5408'

[rails.git] / docker / postgres / openstreetmap-postgres-init.sh

diff --git a/docker/postgres/openstreetmap-postgres-init.sh b/docker/postgres/openstreetmap-postgres-init.sh
index 3973311c12e85f8fb27a9d3b4cd585e0e2476453..511d2d4401abaebc1136cf5529bc4abcb57b111a 100755 (executable)
--- a/docker/postgres/openstreetmap-postgres-init.sh
+++ b/docker/postgres/openstreetmap-postgres-init.sh
@@ -2,13 +2,8 @@
 set -ex
 
 # Create 'openstreetmap' user
+# Password and superuser privilege are needed to successfully run test suite
 psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" <<-EOSQL
     CREATE USER openstreetmap SUPERUSER PASSWORD 'openstreetmap';
     GRANT ALL PRIVILEGES ON DATABASE openstreetmap TO openstreetmap;
 EOSQL
-
-# Create btree_gist extensions
-psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -c "CREATE EXTENSION btree_gist" openstreetmap
-
-# Define custom functions
-psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -f "/usr/local/sbin/osm-db-functions.sql" openstreetmap