diff --git a/.travis.yml b/.travis.yml index 0241808da6..a9b90f2b09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ services: - postgresql before_script: - - docker run -d --restart=always -p 5432:5432 -e POSTGRES_DB=slick_tests quay.io/azavea/postgis:0.1.0 + - docker run -d --restart=always -p 9999:5432 -e POSTGRES_DB=slick_tests quay.io/azavea/postgis:0.1.0 - docker run -d --restart=always --net=host -m 1G --memory-swap -1 --env="MAX_HEAP_SIZE=500M" --env="HEAP_NEWSIZE=100M" --env="CASSANDRA_LISTEN_ADDRESS=127.0.0.1" cassandra:latest - .travis/hbase-install.sh diff --git a/scripts/slickTestDB.sh b/scripts/slickTestDB.sh index 5be0f4d836..cdee04e1e9 100755 --- a/scripts/slickTestDB.sh +++ b/scripts/slickTestDB.sh @@ -5,6 +5,6 @@ docker pull quay.io/azavea/postgis:0.1.0 docker run \ -it \ --rm \ - -p 5432:5432 \ + -p 9999:5432 \ -e POSTGRES_DB=slick_tests \ quay.io/azavea/postgis:0.1.0 diff --git a/slick/src/test/resources/reference.conf b/slick/src/test/resources/reference.conf new file mode 100644 index 0000000000..605428d998 --- /dev/null +++ b/slick/src/test/resources/reference.conf @@ -0,0 +1,21 @@ +# Copyright 2016 Azavea +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +db { + user = "postgres" + password = "postgres" + database = "slick_tests" + host = "localhost:9999" +} + diff --git a/slick/src/main/resources/reference.conf b/slick/src/test/resources/resources/reference.conf similarity index 100% rename from slick/src/main/resources/reference.conf rename to slick/src/test/resources/resources/reference.conf