diff --git a/README.md b/README.md index b3ba1e1..cad7eb7 100644 --- a/README.md +++ b/README.md @@ -24,16 +24,16 @@ ChemCLI, short for Chemotion CLI, is a tool to help you manage Chemotion ELN on ChemCLI tool supports the following versions of Chemotion ELN: -| ELN Version | `docker-compose.yml` file | Supported by chemCLI version | -| ---------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------- | -| [v1.9.x](https://github.com/ComPlat/chemotion_ELN/releases/tag/v1.9.3) | [eln-1.9.3](https://raw.githubusercontent.com/Chemotion/ChemOrc/b7ad83fba1e1db6c5525a11b06bf7eed59a769f6/payload/docker-compose.yml) | [0.2.x](https://github.com/Chemotion/ChemCLI/releases/latest) | -| [v1.8.x](https://github.com/ComPlat/chemotion_ELN/releases/tag/v1.8.2) | [eln-1.8.2](https://raw.githubusercontent.com/Chemotion/ChemCLI/7a62248a40416586e5d5e7d1a77adb6fe4f360fe/payload/docker-compose.yml) | [0.2.x](https://github.com/Chemotion/ChemCLI/releases/latest) | -| [v1.7.x](https://github.com/ComPlat/chemotion_ELN/releases/tag/v1.7.3) | [eln-1.7.3](https://raw.githubusercontent.com/Chemotion/ChemCLI/b8bb1280a6e042b96b8d3e71d030709b113686bc/payload/docker-compose.yml) | [0.2.x](https://github.com/Chemotion/ChemCLI/releases/latest) | -| [v1.6.x](https://github.com/ComPlat/chemotion_ELN/releases/tag/v1.6.2) | [eln-1.6.2](https://raw.githubusercontent.com/Chemotion/ChemCLI/e577832edaba14fa21ee9aa9288e4b00052729c8/payload/docker-compose.yml) | [0.2.x](https://github.com/Chemotion/ChemCLI/releases/latest) | +| ELN Version | `docker-compose.yml` file | Supported by chemCLI version | +| ------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------- | +| [v1.10.x](https://github.com/ComPlat/chemotion_ELN/releases/tag/v1.10.2) | [eln-1.10.2](https://raw.githubusercontent.com/Chemotion/ChemOrc/d2a5994bfe602c63211b90b161d20b27f99ca8e0/payload/docker-compose.yml) | [0.2.x](https://github.com/Chemotion/ChemCLI/releases/latest) | +| [v1.9.x](https://github.com/ComPlat/chemotion_ELN/releases/tag/v1.9.3) | [eln-1.9.3](https://raw.githubusercontent.com/Chemotion/ChemOrc/b7ad83fba1e1db6c5525a11b06bf7eed59a769f6/payload/docker-compose.yml) | [0.2.x](https://github.com/Chemotion/ChemCLI/releases/latest) | +| [v1.8.x](https://github.com/ComPlat/chemotion_ELN/releases/tag/v1.8.2) | [eln-1.8.2](https://raw.githubusercontent.com/Chemotion/ChemCLI/7a62248a40416586e5d5e7d1a77adb6fe4f360fe/payload/docker-compose.yml) | [0.2.x](https://github.com/Chemotion/ChemCLI/releases/latest) | +| [v1.7.x](https://github.com/ComPlat/chemotion_ELN/releases/tag/v1.7.3) | [eln-1.7.3](https://raw.githubusercontent.com/Chemotion/ChemCLI/b8bb1280a6e042b96b8d3e71d030709b113686bc/payload/docker-compose.yml) | [0.2.x](https://github.com/Chemotion/ChemCLI/releases/latest) | -> Chemotion ELN versions 1.9.0 and 1.9.1 were not released as dockerized images, and therefore cannot be installed using this tool. +> Chemotion ELN versions 1.10.0 and 1.10.1 were not released as dockerized images, and therefore cannot be installed using this tool. -> Chemotion ELN versions 1.5.x and below are not supported. Kindly update your instance as soon as possible. If required, please contact the [helpdesk](https://chemotion.net/helpdesk). +> Chemotion ELN versions 1.6.x and below are not supported. Kindly update your instance as soon as possible. If required, please contact the [helpdesk](https://chemotion.net/helpdesk). ## Concept for chemCLI diff --git a/cli/root-instance-new.go b/cli/root-instance-new.go index 0d26437..76f4ae0 100644 --- a/cli/root-instance-new.go +++ b/cli/root-instance-new.go @@ -15,10 +15,10 @@ import ( // helper to determine the required compose file func getComposeAddressToUse(currentVersion, action string) (use string) { versions := make(map[string]string) - latestForThisCLIRelease := "1.9.3" - orderVersions := []string{latestForThisCLIRelease, "1.9.2", "1.8.2", "1.7.3"} // descending order - versions[latestForThisCLIRelease] = "https://raw.githubusercontent.com/Chemotion/ChemCLI/b7ad83fba1e1db6c5525a11b06bf7eed59a769f6/payload/docker-compose.yml" - versions["1.9.2"] = "https://raw.githubusercontent.com/Chemotion/ChemCLI/f30d8ae2dfdfb0160c3ceef30d5540e404c4f23a/payload/docker-compose.yml" + latestForThisCLIRelease := "1.10.2" + orderVersions := []string{latestForThisCLIRelease, "1.9.3", "1.8.2", "1.7.3"} // descending order + versions[latestForThisCLIRelease] = "https://raw.githubusercontent.com/Chemotion/ChemOrc/d2a5994bfe602c63211b90b161d20b27f99ca8e0/payload/docker-compose.yml" + versions["1.9.3"] = "https://raw.githubusercontent.com/Chemotion/ChemCLI/b7ad83fba1e1db6c5525a11b06bf7eed59a769f6/payload/docker-compose.yml" versions["1.8.2"] = "https://raw.githubusercontent.com/Chemotion/ChemCLI/7a62248a40416586e5d5e7d1a77adb6fe4f360fe/payload/docker-compose.yml" versions["1.7.3"] = "https://raw.githubusercontent.com/Chemotion/ChemCLI/b8bb1280a6e042b96b8d3e71d030709b113686bc/payload/docker-compose.yml" validVersions := []string{} diff --git a/cli/root.go b/cli/root.go index 67b22c7..0d28fc5 100644 --- a/cli/root.go +++ b/cli/root.go @@ -68,7 +68,7 @@ const ( // configuration and logging var ( // version number, here to allow override - versionCLI = "0.2.17" + versionCLI = "0.2.18" // current shell shell string // currently selected instance