diff --git a/README.md b/README.md index 921486fe..1cddd739 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,8 @@ The following versions of Cassandra and DSE are published to Docker and supporte | Cassandra 3.11.x | Cassandra 4.0.x | Cassandra 4.1.x | DSE 6.8.x | DSE 6.9.x | | ---------------- | --------------- | --------------- | --------- | ------------- | -| 3.11.7 | 4.0.0 | 4.1.0 | 6.8.25 | 6.9.0-rc.1 | -| 3.11.8 | 4.0.1 | 4.1.1 | 6.8.26 | 6.9.0-rc.3 | +| 3.11.7 | 4.0.0 | 4.1.0 | 6.8.25 | 6.9.0 | +| 3.11.8 | 4.0.1 | 4.1.1 | 6.8.26 | | | 3.11.11 | 4.0.3 | 4.1.2 | 6.8.28 | | | 3.11.12 | 4.0.4 | 4.1.3 | 6.8.29 | | | 3.11.13 | 4.0.5 | 4.1.4 | 6.8.30 | | @@ -89,7 +89,7 @@ Cassandra trunk images are only RedHat UBI8 based. - All DSE 6.8.x Ubuntu based images are available with either JDK 8 or JDK 11 (you have to pick, only one JDK is installed in an image) - All DSE 6.8.x RedHat UBI 8 based images come with JDK 8 - All DSE 6.9.x Ubuntu based images come with only JDK 11 -- All DSE 6.9.x RedHat UBI 9 based images come with only JDK 11 +- All DSE 6.9.x RedHat UBI 8 based images come with only JDK 11 ### Docker coordinates for Cassandra OSS images @@ -165,6 +165,8 @@ Example for DSE 6.9.0 datastax/dse-mgmtapi-6_8:6.9.0-ubi8 +** NOTE: The docker repo is not a typo, it really is `datastax/dse-mgmtapi-6_8` for 6.9 images + ### Docker coordinates for Cassandra Trunk images We also build and publish Nightly images for Cassandra trunk. These images are only published with a RedHat UBI 8 base platform, with JDK 11. diff --git a/management-api-agent-dse-6.8/README.md b/management-api-agent-dse-6.8/README.md index 723c9b04..ab997922 100644 --- a/management-api-agent-dse-6.8/README.md +++ b/management-api-agent-dse-6.8/README.md @@ -27,13 +27,13 @@ mvn package -P dse To run the project tests against DSE, you need to enable the `dse` profile and specify the property to run DSE tests as follows: ```sh -mvn verify -P dse -DrunDSE68tests +mvn verify -P dse -DrunDSE6.8tests ``` To run the test suite using the UBI based image: ```sh -mvn verify -P dse -DrunDSE68testsUBI +mvn verify -P dse -DrunDSE6.8testsUBI ``` ## Docker image builds @@ -55,7 +55,7 @@ Building DSE images locally requires the [buildx](https://docs.docker.com/build/ DSE images can be built with JDK8 or JDK11 using an Ubuntu base image. To build a JDK8 based image, run the following from the root of the parent project: ```sh -docker buildx build --load --progress plain --tag my-dse --file dse/Dockerfile-dse68.jdk8 --target dse --platform linux/amd64 . +docker buildx build --load --progress plain --tag my-dse --file dse/Dockerfile-dse6.8.jdk8 --target dse --platform linux/amd64 . ``` where `my-dse` is whatever tag you want to use for your image. @@ -63,13 +63,13 @@ where `my-dse` is whatever tag you want to use for your image. Likewise, to build a JDK11 Ubuntu based image, run: ```sh -docker buildx build --load --progress plain --tag my-dse --file dse/Dockerfile-dse68.jdk11 --target dse --platform linux/amd64 . +docker buildx build --load --progress plain --tag my-dse --file dse/Dockerfile-dse6.8.jdk11 --target dse --platform linux/amd64 . ``` You can also build a RedHat UBI8 based image with JDK8 with the following: ```sh -docker buildx build --load --progress plain --tag my-dse --file dse/Dockerfile-dse68.ubi8 --target dse --platform linux/amd64 . +docker buildx build --load --progress plain --tag my-dse --file dse/Dockerfile-dse6.8.ubi8 --target dse --platform linux/amd64 . ``` @@ -79,7 +79,7 @@ By default, the DSE version for the image build will be the latest released vers specific DSE version, specify the `DSE_VERSION` build-arg: ```sh -docker buildx build --load --build-arg DSE_VERSION=6.8.26 --progress plain --tag my-dse --file dse/Dockerfile-dse68.jdk11 --target dse --platform linux/amd64 . +docker buildx build --load --build-arg DSE_VERSION=6.8.26 --progress plain --tag my-dse --file dse/Dockerfile-dse6.8.jdk11 --target dse --platform linux/amd64 . ``` ## Running a locally built image diff --git a/management-api-agent-dse-6.9/README.md b/management-api-agent-dse-6.9/README.md index 59d081ec..4305e7e9 100644 --- a/management-api-agent-dse-6.9/README.md +++ b/management-api-agent-dse-6.9/README.md @@ -27,13 +27,13 @@ mvn package -P dse To run the project tests against DSE, you need to enable the `dse` profile and specify the property to run DSE tests as follows: ```sh -mvn verify -P dse -DrunDSE69tests +mvn verify -P dse -DrunDSE6.9tests ``` To run the test suite using the UBI based image: ```sh -mvn verify -P dse -DrunDSE69testsUBI +mvn verify -P dse -DrunDSE6.9testsUBI ``` ## Docker image builds @@ -55,7 +55,7 @@ Building DSE images locally requires the [buildx](https://docs.docker.com/build/ DSE 6.9 images can be built based on Ubuntu or RedHat's UBI8 base images. To build an Ubuntu based image, run the following from the root of the parent project: ```sh -docker buildx build --load --progress plain --tag my-dse --file dse/Dockerfile-dse69.jdk11 --target dse --platform linux/amd64 . +docker buildx build --load --progress plain --tag my-dse --file dse/Dockerfile-dse6.9.jdk11 --target dse --platform linux/amd64 . ``` where `my-dse` is whatever tag you want to use for your image. @@ -63,7 +63,7 @@ where `my-dse` is whatever tag you want to use for your image. Likewise, to build a UBI8 based image, run: ```sh -docker buildx build --load --progress plain --tag my-dse --file dse/Dockerfile-dse69.ubi8 --target dse --platform linux/amd64 . +docker buildx build --load --progress plain --tag my-dse --file dse/Dockerfile-dse6.9.ubi8 --target dse --platform linux/amd64 . ``` ### Building a specific version of DSE @@ -72,7 +72,7 @@ By default, the DSE version for the image build will be the latest released vers specific DSE version, specify the `DSE_VERSION` build-arg: ```sh -docker buildx build --load --build-arg DSE_VERSION=6.9.0 --progress plain --tag my-dse --file dse/Dockerfile-dse69.jdk11 --target dse --platform linux/amd64 . +docker buildx build --load --build-arg DSE_VERSION=6.9.0 --progress plain --tag my-dse --file dse/Dockerfile-dse6.9.jdk11 --target dse --platform linux/amd64 . ``` ## Running a locally built image