diff --git a/.circleci/compose/e2e/docker-compose.yaml b/.circleci/compose/e2e/docker-compose.yaml index 3bacd752b92..01e61b3575f 100644 --- a/.circleci/compose/e2e/docker-compose.yaml +++ b/.circleci/compose/e2e/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3.7" services: determined-db: - image: postgres:10.8 + image: postgres:14.13 volumes: - determined-db-volume:/var/lib/postgresql/data restart: always diff --git a/.circleci/devcluster/custom-agent-version.devcluster.yaml b/.circleci/devcluster/custom-agent-version.devcluster.yaml index 698b89b1b70..bfa5483bb3d 100644 --- a/.circleci/devcluster/custom-agent-version.devcluster.yaml +++ b/.circleci/devcluster/custom-agent-version.devcluster.yaml @@ -1,7 +1,7 @@ stages: - db: name: db - + image_name: "postgres":$DET_POSTGRES_VERSION - master: pre: - sh: make -C tools prep-root diff --git a/.circleci/devcluster/double-priority.devcluster.yaml b/.circleci/devcluster/double-priority.devcluster.yaml index 3fd248afa81..9191256a410 100644 --- a/.circleci/devcluster/double-priority.devcluster.yaml +++ b/.circleci/devcluster/double-priority.devcluster.yaml @@ -1,7 +1,7 @@ stages: - db: name: db - + image_name: "postgres:${DET_POSTGRES_VERSION}" - master: pre: - sh: make -C tools prep-root diff --git a/.circleci/devcluster/double-reattach.devcluster.yaml b/.circleci/devcluster/double-reattach.devcluster.yaml index 92795ec6f5d..e12010accc2 100644 --- a/.circleci/devcluster/double-reattach.devcluster.yaml +++ b/.circleci/devcluster/double-reattach.devcluster.yaml @@ -1,13 +1,16 @@ stages: - db: name: db - + image_name: "postgres:${DET_POSTGRES_VERSION}" - master: pre: - sh: make -C tools prep-root config_file: security: initial_user_password: $INITIAL_USER_PASSWORD + token: + max_lifespan: + default_lifespan: db: host: localhost port: 5432 diff --git a/.circleci/devcluster/double.devcluster.yaml b/.circleci/devcluster/double.devcluster.yaml index 0ccad0ab463..81ce138cea3 100644 --- a/.circleci/devcluster/double.devcluster.yaml +++ b/.circleci/devcluster/double.devcluster.yaml @@ -1,7 +1,7 @@ stages: - db: name: db - + image_name: "postgres:${DET_POSTGRES_VERSION}" - master: pre: - sh: make -C tools prep-root diff --git a/.circleci/devcluster/elastic-base.devcluster.yaml b/.circleci/devcluster/elastic-base.devcluster.yaml index 5f1010db806..4e21d1c54cc 100644 --- a/.circleci/devcluster/elastic-base.devcluster.yaml +++ b/.circleci/devcluster/elastic-base.devcluster.yaml @@ -1,6 +1,6 @@ stages: - db: name: db - + image_name: "postgres:${DET_POSTGRES_VERSION}" - elastic: name: elastic diff --git a/.circleci/devcluster/elastic.devcluster.yaml b/.circleci/devcluster/elastic.devcluster.yaml index d439221997a..8745f3f6fc5 100644 --- a/.circleci/devcluster/elastic.devcluster.yaml +++ b/.circleci/devcluster/elastic.devcluster.yaml @@ -1,6 +1,7 @@ stages: - db: name: db + image_name: "postgres:${DET_POSTGRES_VERSION}" - elastic: name: elastic diff --git a/.circleci/devcluster/multi-k8s.devcluster.yaml b/.circleci/devcluster/multi-k8s.devcluster.yaml index 3f743134c87..01a3b2301dd 100644 --- a/.circleci/devcluster/multi-k8s.devcluster.yaml +++ b/.circleci/devcluster/multi-k8s.devcluster.yaml @@ -1,7 +1,7 @@ stages: - db: name: db - + image_name: "postgres:${DET_POSTGRES_VERSION}" - master: pre: - sh: make -C tools prep-root diff --git a/.circleci/devcluster/multi-resource-pools.devcluster.yaml b/.circleci/devcluster/multi-resource-pools.devcluster.yaml index 5529e251148..423520d9111 100644 --- a/.circleci/devcluster/multi-resource-pools.devcluster.yaml +++ b/.circleci/devcluster/multi-resource-pools.devcluster.yaml @@ -2,6 +2,7 @@ stages: - db: name: db port: 5434 + image_name: "postgres:${DET_POSTGRES_VERSION}" - master: pre: diff --git a/.circleci/devcluster/oauth.devcluster.yaml b/.circleci/devcluster/oauth.devcluster.yaml index 12621aecb44..e1862302daa 100644 --- a/.circleci/devcluster/oauth.devcluster.yaml +++ b/.circleci/devcluster/oauth.devcluster.yaml @@ -1,7 +1,7 @@ stages: - db: name: db - + image_name: "postgres:${DET_POSTGRES_VERSION}" - master: pre: - sh: make -C tools prep-root diff --git a/.circleci/devcluster/port-registry.devcluster.yaml b/.circleci/devcluster/port-registry.devcluster.yaml index c15edae0b74..d9b330032b5 100644 --- a/.circleci/devcluster/port-registry.devcluster.yaml +++ b/.circleci/devcluster/port-registry.devcluster.yaml @@ -1,6 +1,7 @@ stages: - db: name: db + image_name: "postgres:${DET_POSTGRES_VERSION}" - master: pre: diff --git a/.circleci/devcluster/postgres-with-ssl.devcluster.yaml b/.circleci/devcluster/postgres-with-ssl.devcluster.yaml index 4771b5ad932..52284392bfb 100644 --- a/.circleci/devcluster/postgres-with-ssl.devcluster.yaml +++ b/.circleci/devcluster/postgres-with-ssl.devcluster.yaml @@ -12,7 +12,7 @@ stages: cd /tmp/pg openssl req -new -x509 -days 365 -nodes -text -out server.crt -keyout server.key -subj "/CN=localhost" chmod 0400 server.crt server.key - uid=$(docker run --rm postgres:$DET_POSTGRES_VERSION id -u postgres) + uid=$(docker run --rm "postgres:${DET_POSTGRES_VERSION}" id -u postgres) sudo chown $uid server.crt server.key cat >pg_hba.conf <