Skip to content

Commit

Permalink
add password for postgres docker image;
Browse files Browse the repository at this point in the history
fix travis.yml indentation
  • Loading branch information
Kononnable committed Mar 31, 2020
1 parent 5369a7a commit 2921b56
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The database to use when testing against Postgres.
PG_DATABASE_URL=postgresql://postgres@localhost:5432/diesel_test
PG_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/diesel_test
# The database to use when running the Postgres examples during testing.
PG_EXAMPLE_DATABASE_URL=postgresql://postgres@localhost:5432/diesel_example
PG_EXAMPLE_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/diesel_example

# The database to use when testing against MySQL.
MYSQL_DATABASE_URL=mysql://[email protected]:3306/diesel_test
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ matrix:
script:
- (cd diesel_cli && cargo test --no-default-features --features "sqlite-bundled")
- rust: 1.37.0
name: "Minimal supported rust version == 1.37.0"
name: "Minimal supported rust version == 1.37.0"
script:
- cargo check --all

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Thank you! We'll try to respond as quickly as possible.
! echo 'CREATE DATABASE diesel_test; CREATE DATABASE diesel_unit_test;' | docker exec -i diesel.mysql mysql
do sleep 1; done

docker run -d --name diesel.postgres -p 5432:5432 postgres
docker run -d --name diesel.postgres -p 5432:5432 -e POSTGRES_PASSWORD=postgres postgres
while
sleep 1;
! echo 'CREATE DATABASE diesel_test;' | docker exec -i diesel.postgres psql -U postgres
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ services:
postgres:
image: postgres
container_name: diesel.postgres
environment:
POSTGRES_PASSWORD: "postgres"
volumes:
- "postgres-data:/var/lib/postgres/:delegated"
- "./docker/postgres/init:/docker-entrypoint-initdb.d"
Expand Down

0 comments on commit 2921b56

Please sign in to comment.