Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): use latest tag for InfluxDB 2, use correct image for InfluxDB 2 nightly #203

Merged
merged 2 commits into from
Mar 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ jobs:
default: &default-maven-image "circleci/openjdk:8"
influxdb-image:
type: string
default: &default-influxdb-image "influxdb:v2.0.4"
default: &default-influxdb-image "influxdb:latest"
docker:
- image: << parameters.maven-image >>
- image: &influx-image quay.io/influxdb/<< parameters.influxdb-image >>
- image: &influx-image << parameters.influxdb-image >>
environment:
INFLUXD_HTTP_BIND_ADDRESS: :9999
- image: &influx-image quay.io/influxdb/<< parameters.influxdb-image >>
- image: &influx-image << parameters.influxdb-image >>
name: influxdb_v2_onboarding
environment:
INFLUXD_HTTP_BIND_ADDRESS: :9999
Expand Down Expand Up @@ -179,7 +179,7 @@ workflows:
maven-image: "circleci/openjdk:11"
- tests-java:
name: jdk-8-nightly
influxdb-image: "influxdb2:nightly"
influxdb-image: "quay.io/influxdb/influxdb:nightly"
- deploy-snapshot:
requires:
- jdk-8
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
1. [#197](https://github.com/influxdata/influxdb-client-java/pull/197): InfluxException bodyError type changed from JSONObject to Map<String, Object>

### Bug Fixes
1. [#197](https://github.com/influxdata/influxdb-client-java/issues/196): Removed badly licenced JSON-Java library
1. [#196](https://github.com/influxdata/influxdb-client-java/issues/196): Removed badly licenced JSON-Java library

### CI
1. [#203](https://github.com/influxdata/influxdb-client-java/pull/203): Updated stable image to `influxdb:latest` and nightly to `quay.io/influxdb/influxdb:nightly`

## 1.15.0 [2021-01-29]

Expand Down
9 changes: 2 additions & 7 deletions scripts/influxdb-restart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,13 @@

set -e

DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/"
DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}"

DEFAULT_INFLUXDB_VERSION="1.8"
INFLUXDB_VERSION="${INFLUXDB_VERSION:-$DEFAULT_INFLUXDB_VERSION}"
INFLUXDB_IMAGE=influxdb:${INFLUXDB_VERSION}-alpine

DEFAULT_INFLUXDB_V2_REPOSITORY="influxdb"
DEFAULT_INFLUXDB_V2_VERSION="v2.0.4"
INFLUXDB_V2_REPOSITORY="${INFLUXDB_V2_REPOSITORY:-$DEFAULT_INFLUXDB_V2_REPOSITORY}"
DEFAULT_INFLUXDB_V2_VERSION="latest"
INFLUXDB_V2_VERSION="${INFLUXDB_V2_VERSION:-$DEFAULT_INFLUXDB_V2_VERSION}"
INFLUXDB_V2_IMAGE=${DOCKER_REGISTRY}${INFLUXDB_V2_REPOSITORY}:${INFLUXDB_V2_VERSION}
INFLUXDB_V2_IMAGE=influxdb:${INFLUXDB_V2_VERSION}

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

Expand Down