From 98b49cc27737a9211c53169f5571ffded8dbc33b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 1 May 2021 01:11:48 +0000 Subject: [PATCH] Run update.sh --- aerospike/README.md | 16 ++++++++++------ photon/README.md | 8 ++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/aerospike/README.md b/aerospike/README.md index 960e62a82..f38f3fb3a 100644 --- a/aerospike/README.md +++ b/aerospike/README.md @@ -221,15 +221,19 @@ Enterprise customers are welcome to participate in the community forum, but can # License -Copyright 2020-2021 Aerospike, Inc. - -Aerospike Community Edition is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0). - -If you are using the Aerospike Database EE evaluation feature key file, you are operating under the [Aerospike Evaluation License Agreement](https://www.aerospike.com/forms/evaluation-license-agreement/). +Copyright 2019-2021 Aerospike, Inc. If you are using a feature key file you received as part of your commercial enterprise license, you are operating under the [Aerospike Master License Agreement](https://www.aerospike.com/forms/master-license-agreement/). -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +If you are using the Aerospike Database EE evaluation feature key file, you are operating under the [Aerospike Evaluation License Agreement](https://www.aerospike.com/forms/evaluation-license-agreement/). + +If you are using Aerospike Database CE refer to the license information in the [aerospike/aerospike-server](https://github.com/aerospike/aerospike-server) repository. + +As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained). + +Some additional license information which was able to be auto-detected might be found in [the `repo-info` repository's `aerospike/` directory](https://github.com/docker-library/repo-info/tree/master/repos/aerospike). + +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within. As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained). diff --git a/photon/README.md b/photon/README.md index 86b49423c..cf5a88e87 100644 --- a/photon/README.md +++ b/photon/README.md @@ -24,10 +24,10 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`4.0`, `4.0-20210416`, `latest`](https://github.com/vmware/photon-docker-image/blob/e156344c305129a464eeb9c5fa1a383502c54d71/docker/Dockerfile) -- [`3.0`, `3.0-20210416`](https://github.com/vmware/photon-docker-image/blob/2aeb97f8dde8bfa5f781748b0c71425bfe47add1/docker/Dockerfile) -- [`1.0`, `1.0-20210416`](https://github.com/vmware/photon-docker-image/blob/76de488ffd07e0babc7d0ba7fb62bd25673ab672/docker/Dockerfile) -- [`2.0`, `2.0-20210416`](https://github.com/vmware/photon-docker-image/blob/409329193d08c81b54b5ab7d0a0874aa63f1a294/docker/Dockerfile) +- [`4.0`, `4.0-20210430`, `latest`](https://github.com/vmware/photon-docker-image/blob/29d844360d8f120c992d09cf83759b8b0202a2b4/docker/Dockerfile) +- [`3.0`, `3.0-20210430`](https://github.com/vmware/photon-docker-image/blob/9098522a381d2cc7a9d74e689a1fca403d279b8a/docker/Dockerfile) +- [`1.0`, `1.0-20210430`](https://github.com/vmware/photon-docker-image/blob/f0687ad8074841f30c6c76a4a893147cbe0212c6/docker/Dockerfile) +- [`2.0`, `2.0-20210430`](https://github.com/vmware/photon-docker-image/blob/9b9eab74f99c938d31cbceeeb677e3446ef1adca/docker/Dockerfile) # Quick reference (cont.)