Commit 2023438

committed

add service.postgres-tls

1 parent 169b9d1 commit 2023438Copy full SHA for 2023438

File tree

+26

-4

lines changed

+26

-4

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,23 @@ jobs:`
`21`	`21`	`runs-on: ubuntu-latest`
`22`	`22`	`services:`
`23`	`23`	`postgres:`
`24`		`- image: nimbustech/postgres-ssl:9.5`
	`24`	`+ image: postgres:10.8`
`25`	`25`	`env:`
`26`	`26`	`POSTGRES_USER: postgres`
`27`	`27`	`POSTGRES_PASSWORD: postgres`
`28`	`28`	`POSTGRES_DB: postgres`
`29`	`29`	`ports:`
`30`	`30`	`- 5432:5432`
	`31`	`+ # needed because the postgres container does not provide a healthcheck`
	`32`	`+ options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5`
	`33`	`+ postgres-tls:`
	`34`	`+ image: nimbustech/postgres-ssl:9.5`
	`35`	`+ env:`
	`36`	`+ POSTGRES_USER: postgres`
	`37`	`+ POSTGRES_PASSWORD: postgres`
	`38`	`+ POSTGRES_DB: postgres`
	`39`	`+ ports:`
	`40`	`+ - 5433:5432`
`31`	`41`	`volumes:`
`32`	`42`	`- tests/cert:/var/ssl`
`33`	`43`	`# needed because the postgres container does not provide a healthcheck`
`@@ -52,7 +62,8 @@ jobs:`
`52`	`62`	`version: '0.11.0'`
`53`	`63`	`args: --out Xml --all --all-features`
`54`	`64`	`env:`
`55`		`- TEST_URL: "postgresql://localhost/postgres?user=postgres&password=postgres?sslmode=disable"`
	`65`	`+ TEST_URL: "postgresql://localhost/postgres?user=postgres&password=postgres"`
	`66`	`+ TEST_TLS_URL: "postgresql://localhost:5433/postgres?user=postgres&password=postgres?sslmode=verify-ca"`
`56`	`67`	`- name: Upload to codecov.io`
`57`	`68`	`uses: codecov/codecov-action@v1.0.2`
`58`	`69`	`with:`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,23 @@ jobs:`
`29`	`29`	`- 1.40.0`
`30`	`30`	`services:`
`31`	`31`	`postgres:`
`32`		`- image: nimbustech/postgres-ssl:9.5`
	`32`	`+ image: postgres:10.8`
`33`	`33`	`env:`
`34`	`34`	`POSTGRES_USER: postgres`
`35`	`35`	`POSTGRES_PASSWORD: postgres`
`36`	`36`	`POSTGRES_DB: postgres`
`37`	`37`	`ports:`
`38`	`38`	`- 5432:5432`
	`39`	`+ # needed because the postgres container does not provide a healthcheck`
	`40`	`+ options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5`
	`41`	`+ postgres-tls:`
	`42`	`+ image: nimbustech/postgres-ssl:9.5`
	`43`	`+ env:`
	`44`	`+ POSTGRES_USER: postgres`
	`45`	`+ POSTGRES_PASSWORD: postgres`
	`46`	`+ POSTGRES_DB: postgres`
	`47`	`+ ports:`
	`48`	`+ - 5433:5432`
`39`	`49`	`volumes:`
`40`	`50`	`- tests/cert:/var/ssl`
`41`	`51`	`# needed because the postgres container does not provide a healthcheck`
`@@ -61,4 +71,5 @@ jobs:`
`61`	`71`	`command: test`
`62`	`72`	`args: --all --all-features --no-fail-fast -- --nocapture`
`63`	`73`	`env:`
`64`		`- TEST_URL: "postgresql://localhost/postgres?user=postgres&password=postgres?sslmode=disable"`
	`74`	`+ TEST_URL: "postgresql://localhost/postgres?user=postgres&password=postgres"`
	`75`	`+ TEST_TLS_URL: "postgresql://localhost:5433/postgres?user=postgres&password=postgres?sslmode=verify-ca"`

Comments

(0)