Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

Commit

Permalink
Auth db in port 5433 (#15)
Browse files Browse the repository at this point in the history
* Postgresql pointing to a different port than 5432

* Uncommented load jenkins variables from cico setup script

* Run CI tests using port 5432
  • Loading branch information
Hector Fernandez authored and alexeykazakov committed Jul 26, 2017
1 parent 42225ac commit dea9df4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .make/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ else
-t \
$(DOCKER_RUN_INTERACTIVE_SWITCH) \
--name="$(DOCKER_CONTAINER_NAME)" \
-e AUTH_POSTGRES_PORT=5432 \
-v $(CUR_DIR):$(PACKAGE_PATH):Z \
-u $(shell id -u $(USER)):$(shell id -g $(USER)) \
-e GOPATH=$(GOPATH_IN_CONTAINER) \
Expand Down
4 changes: 2 additions & 2 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#------------------------

postgres.host: localhost
postgres.port: 5432
postgres.port: 5433
postgres.user: postgres
postgres.password: mysecretpassword
postgres.database: postgres
Expand All @@ -14,7 +14,7 @@ postgres.connection.timeout: 5
postgres.connection.retrysleep: 1s
postgres.connection.maxidle: -1
postgres.connection.maxopen: -1
# Timeout for a transaction in minutes
# Timeout for a transaction in minutes
postgres.transaction.timeout: 5m

#------------------------
Expand Down
2 changes: 1 addition & 1 deletion configuration/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (c *ConfigurationData) setConfigDefaults() {
//---------
c.v.SetTypeByDefaultValue(true)
c.v.SetDefault(varPostgresHost, "localhost")
c.v.SetDefault(varPostgresPort, 5432)
c.v.SetDefault(varPostgresPort, 5433)
c.v.SetDefault(varPostgresUser, "postgres")
c.v.SetDefault(varPostgresDatabase, "postgres")
c.v.SetDefault(varPostgresPassword, "mysecretpassword")
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
db:
image: registry.centos.org/postgresql/postgresql:9.6
ports:
- "5432:5432"
- "5433:5432"
environment:
POSTGRESQL_ADMIN_PASSWORD: mysecretpassword
networks:
Expand Down

0 comments on commit dea9df4

Please sign in to comment.