diff --git a/README.md b/README.md index d9b8848..f33c4cf 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,29 @@ Just run the docker-compose file to create the database. docker-compose up -d ``` +## Dev -## Run the tests +### Connect to the database + +``` +docker run -it --rm --link canape_postgresql_dev:postgres postgres:9.5 psql -h postgres -U test +``` + +Then connect to the database you wanna check : + +``` +\c dev +``` + +### Apply the migrations + +``` +migrate -url 'postgres://test:test@127.0.0.1:5432/dev?sslmode=disable' -path ./sql up +migrate -url 'postgres://test:test@127.0.0.1:5432/dev?sslmode=disable' -path ./sqltest up +``` + + +### Run the tests ``` diff --git a/docker-compose.yml b/docker/docker-compose.yml similarity index 80% rename from docker-compose.yml rename to docker/docker-compose.yml index 75fd8ea..0413f89 100644 --- a/docker-compose.yml +++ b/docker/docker-compose.yml @@ -5,5 +5,7 @@ postgresql: environment: - POSTGRES_PASSWORD=test - POSTGRES_USER=test + volumes: + - .:/docker-entrypoint-initdb.d/ ports: - 127.0.0.1:5432:5432 diff --git a/docker/init.sql b/docker/init.sql new file mode 100644 index 0000000..3c2e2cb --- /dev/null +++ b/docker/init.sql @@ -0,0 +1 @@ +CREATE DATABASE dev; diff --git a/main.go b/main.go index 8762ee8..6d17083 100644 --- a/main.go +++ b/main.go @@ -23,7 +23,7 @@ func (b *UserBackend) Get(username string) (auth.User, error) { func main() { log := logrus.NewEntry(logrus.New()) - pgdsn := "postgres://test:test@127.0.0.1:5432/test?sslmode=disable" + pgdsn := "postgres://test:test@127.0.0.1:5432/dev?sslmode=disable" db, err := sqlx.Connect("postgres", pgdsn) if err != nil { log.Panic(err) diff --git a/sqltest/001_data.down.sql b/sqltest/101_data.down.sql similarity index 100% rename from sqltest/001_data.down.sql rename to sqltest/101_data.down.sql diff --git a/sqltest/001_data.up.sql b/sqltest/101_data.up.sql similarity index 100% rename from sqltest/001_data.up.sql rename to sqltest/101_data.up.sql