diff --git a/Release_checklist.md b/Release_checklist.md index 07071b6f..46c93181 100644 --- a/Release_checklist.md +++ b/Release_checklist.md @@ -1,18 +1,18 @@ # Release checklist -1. Merge the `develop` branch into `master`. -2. CI will automatically create a new release in GitHub with _octo CLI_ and update the `latest` tag for both `octo` and `octopod`. Wait for CI to complete. -3. Edit the created release in GitHub to match the version you are releasing. - 1. Change the release name to the version being released. - 2. Uncheck "This is a pre-release" -4. Push the new release of `octo` and `octopod`. To do this run `./release.sh `. -5. Update the referenced tags in documentation -6. If there were changes to the examples: +1. Update the referenced tags in the documentation +2. If there were changes to the examples: 1. Build and push the new containers: 1. octopod-web-app-example 2. octopod-helm-example 2. Create a new tag incrementing the integer version number of the tag: - 1. Pull the image (`docker pull`) + 1. Build the updated images 2. Tag it with the new `` (`docker tag`) 3. Push the new tag (`docker push`) 3. Update docs where the tags are referenced. +3. Merge the `develop` branch into `master`. +4. CI will automatically create a new release in GitHub with _octo CLI_ and update the `latest` tag for both `octo` and `octopod`. Wait for CI to complete. +5. Edit the created release in GitHub to match the version you are releasing. + 1. Change the release name to the version being released. + 2. Uncheck "This is a pre-release" +6. Push the new release of `octo` and `octopod`. To do this run `./release.sh `. diff --git a/docs/en/Octopod_deployment_guide.md b/docs/en/Octopod_deployment_guide.md index cba2b7bc..3082f79f 100644 --- a/docs/en/Octopod_deployment_guide.md +++ b/docs/en/Octopod_deployment_guide.md @@ -264,7 +264,7 @@ cd /tmp/octopod/charts ################################################# registry="typeable" -tag="1.0" +tag="1.1" image="octopod" octo_image="octo" diff --git a/docs/ru/Octopod_deployment_with_K8S.md b/docs/ru/Octopod_deployment_with_K8S.md index a44af8ee..d93272cc 100644 --- a/docs/ru/Octopod_deployment_with_K8S.md +++ b/docs/ru/Octopod_deployment_with_K8S.md @@ -178,7 +178,7 @@ registry="typeable" # tag Octopod Server - tag="1.0" + tag="1.1" # название docker образа Octopod Server image="octopod" diff --git a/examples/helm-based-control-scripts/README.md b/examples/helm-based-control-scripts/README.md index ce5ae78a..1421b4dc 100644 --- a/examples/helm-based-control-scripts/README.md +++ b/examples/helm-based-control-scripts/README.md @@ -5,5 +5,5 @@ An Example of Helm-based control scripts. ## Build Docker image ```bash -docker build -f docker/Dockerfile -t typeable/octopod-helm-example:1.0 . +docker build -f docker/Dockerfile -t typeable/octopod-helm-example . ```