diff options
| author | Toon Claes <toon@gitlab.com> | 2022-07-07 13:08:17 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2022-07-07 13:08:17 +0300 |
| commit | e4a8d5e24986a1f3f8c113d6f2d4e14d2d21b952 (patch) | |
| tree | 60ef4909af3417c7b4068afde2c00c4348acb753 | |
| parent | 9ff756d21305e63a256ba74c6f75b5c867d9fc22 (diff) | |
| parent | 7bdb3780af3fe639bfd8a38ec44d2b2aff520eb2 (diff) | |
Merge branch 'pks-gitaly-upgrade-build-image' into 'master'
ci: Upgrade build images to most recent ones
See merge request gitlab-org/gitaly!4688
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | _support/praefect-schema.sql | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 786ae3200..340777a2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - qa default: - image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}-postgresql-11:git-2.33 + image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}:git-2.36 tags: - gitlab-org diff --git a/_support/praefect-schema.sql b/_support/praefect-schema.sql index a1aa215b1..c0874080c 100644 --- a/_support/praefect-schema.sql +++ b/_support/praefect-schema.sql @@ -20,7 +20,7 @@ SET row_security = off; -- Name: praefect_database_schema; Type: DATABASE; Schema: -; Owner: - -- -CREATE DATABASE praefect_database_schema WITH TEMPLATE = template0 ENCODING = 'UTF8' LC_COLLATE = 'en_US.utf8' LC_CTYPE = 'en_US.utf8'; +CREATE DATABASE praefect_database_schema WITH TEMPLATE = template0 ENCODING = 'UTF8' LOCALE = 'en_US.utf8'; \connect praefect_database_schema @@ -98,8 +98,6 @@ CREATE FUNCTION public.notify_on_change() RETURNS trigger SET default_tablespace = ''; -SET default_with_oids = false; - -- -- Name: node_status; Type: TABLE; Schema: public; Owner: - -- |