Merge branch 'master' into next

salsita · Nov 25, 2019 · 775c45f · 775c45f
2 parents c159f43 + 9e1b82b
commit 775c45f
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 87 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -95,7 +95,7 @@ jobs:
       - <<: *node-image
         environment:
           - DATABASE_URL=postgres://ubuntu@localhost:5432/circle_test
-      - image: postgres:10.10-alpine
+      - image: postgres:10.11-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_DB=circle_test
@@ -108,7 +108,7 @@ jobs:
       - <<: *node-image
         environment:
           - DATABASE_URL=postgres://ubuntu@localhost:5432/circle_test
-      - image: postgres:11.5-alpine
+      - image: postgres:11.6-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_DB=circle_test
@@ -147,7 +147,7 @@ jobs:
       - image: circleci/node:8
         environment:
           - DATABASE_URL=postgres://ubuntu@localhost:5432/circle_test
-      - image: postgres:10.10-alpine
+      - image: postgres:10.11-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_DB=circle_test
@@ -160,7 +160,7 @@ jobs:
       - image: circleci/node:12
         environment:
           - DATABASE_URL=postgres://ubuntu@localhost:5432/circle_test
-      - image: postgres:10.10-alpine
+      - image: postgres:10.11-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_DB=circle_test
@@ -171,7 +171,7 @@ jobs:
   test-config:
     docker:
       - <<: *node-image
-      - image: postgres:10.10-alpine
+      - image: postgres:10.11-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_DB=circle_test
@@ -199,7 +199,7 @@ jobs:
         environment:
           # can't use characters @#?/ in password - they have special meaning in url
           - DATABASE_URL=postgres://ubuntu:123456abcdefghABCDEFGH~\`\!$%^\&*-_=+{}[]\(\)\<\>,.\;:\"\'\|\\@localhost:5432/circle_test
-      - image: postgres:10.10-alpine
+      - image: postgres:10.11-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=123456abcdefghABCDEFGH~\`\!$%^\&*-_=+{}[]\(\)\<\>,.\;:\"\'\|\\
@@ -211,7 +211,7 @@ jobs:
   test-password-2:
     docker:
       - <<: *node-image
-      - image: postgres:10.10-alpine
+      - image: postgres:10.11-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=123456abcdefghABCDEFGH~\`\!@#$%^\&*-_=+{}[]\(\)\<\>,.\;:\"\'?\|/\\
@@ -242,7 +242,7 @@ jobs:
         - PGUSER=ubuntu
         - PGPASSWORD=123456abcdefghABCDEFGH~\`\!@#$%^\&*-_=+{}[]\(\)\<\>,.\;:\"\'?\|/\\
         - PGDATABASE=circle_test
-    - image: postgres:10.10-alpine
+    - image: postgres:10.11-alpine
       environment:
         - POSTGRES_USER=ubuntu
         - POSTGRES_PASSWORD=123456abcdefghABCDEFGH~\`\!@#$%^\&*-_=+{}[]\(\)\<\>,.\;:\"\'?\|/\\
@@ -258,7 +258,7 @@ jobs:
           - DATABASE_URL=postgres://ubuntu@localhost:5432/circle_test
           # used in tests
           - SCHEMA=myschema
-      - image: postgres:10.10-alpine
+      - image: postgres:10.11-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_DB=circle_test
@@ -275,7 +275,7 @@ jobs:
           - DATABASE_URL=postgres://ubuntu@localhost:5432/circle_test
           # used in tests
           - SCHEMA=myschema
-      - image: postgres:10.10-alpine
+      - image: postgres:10.11-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_DB=circle_test