Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
960d1d4c59
commit
50d3b4e4fe
|
@ -1,5 +0,0 @@
|
||||||
---
|
|
||||||
title: 'Switch Auto Test CI template to `bitnami/postgresql` docker image (was previously `postgres`)'
|
|
||||||
merge_request: 44329
|
|
||||||
author:
|
|
||||||
type: changed
|
|
|
@ -1,10 +1,9 @@
|
||||||
test:
|
test:
|
||||||
variables:
|
variables:
|
||||||
POSTGRES_VERSION: 9.6.16 # This is the version used by Auto Deploy by default, see https://hub.docker.com/r/bitnami/postgresql/tags for available tags
|
POSTGRES_VERSION: 9.6.16
|
||||||
POSTGRES_DB: test
|
POSTGRES_DB: test
|
||||||
services:
|
services:
|
||||||
- name: "bitnami/postgresql:${POSTGRES_VERSION}"
|
- "postgres:${POSTGRES_VERSION}"
|
||||||
alias: postgres
|
|
||||||
stage: test
|
stage: test
|
||||||
image: gliderlabs/herokuish:latest
|
image: gliderlabs/herokuish:latest
|
||||||
needs: []
|
needs: []
|
||||||
|
|
Loading…
Reference in New Issue