Skip to content

Commit e8dfea7

Browse files
committed
chore(ci): use latest tag for InfluxDB 2, use correct image for InfluxDB 2 nightly
1 parent eadbf6a commit e8dfea7

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
default: &default-python "circleci/python:3.6-buster"
5050
influxdb-image:
5151
type: string
52-
default: "influxdb:v2.0.4"
52+
default: "influxdb:latest"
5353
enabled-ciso-8601:
5454
type: boolean
5555
default: true
@@ -58,7 +58,7 @@ jobs:
5858
environment: # environment variables for primary container
5959
PIPENV_VENV_IN_PROJECT: true
6060
ENABLED_CISO_8601: << parameters.enabled-ciso-8601 >>
61-
- image: quay.io/influxdb/<< parameters.influxdb-image >>
61+
- image: << parameters.influxdb-image >>
6262
environment:
6363
INFLUXD_HTTP_BIND_ADDRESS: :8086
6464
steps:
@@ -136,7 +136,7 @@ workflows:
136136
enabled-ciso-8601: false
137137
- tests-python:
138138
name: test-3.6-influxdb-nightly
139-
influxdb-image: "influxdb2:nightly"
139+
influxdb-image: "quay.io/influxdb/influxdb:nightly"
140140
- tests-python:
141141
name: test-3.7
142142
python-image: "circleci/python:3.7-buster"

scripts/influxdb-restart.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,9 @@
2323

2424
set -e
2525

26-
DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/"
27-
DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}"
28-
29-
DEFAULT_INFLUXDB_V2_REPOSITORY="influxdb"
30-
DEFAULT_INFLUXDB_V2_VERSION="v2.0.4"
31-
INFLUXDB_V2_REPOSITORY="${INFLUXDB_V2_REPOSITORY:-$DEFAULT_INFLUXDB_V2_REPOSITORY}"
26+
DEFAULT_INFLUXDB_V2_VERSION="latest"
3227
INFLUXDB_V2_VERSION="${INFLUXDB_V2_VERSION:-$DEFAULT_INFLUXDB_V2_VERSION}"
33-
INFLUXDB_V2_IMAGE=${DOCKER_REGISTRY}${INFLUXDB_V2_REPOSITORY}:${INFLUXDB_V2_VERSION}
28+
INFLUXDB_V2_IMAGE=influxdb:${INFLUXDB_V2_VERSION}
3429

3530
SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
3631

0 commit comments

Comments
 (0)