Merge pull request #565 from entando/ENDOC-573-adjust-70-version

ENDOC-573 Bump fixpack for 7.0 to v7.0.2, plus adjust a couple more 7…

vuepress/docs/.vuepress/config.js

@@ -135,6 +135,7 @@ module.exports = {
     // Custom theme config
     entando: {
       fixpack: {
+        "v70": "v7.0.2",
         "v71": "v7.1.0"
       },
       logoLink: "https://entando.com",

vuepress/docs/next/tutorials/devops/backing-up-and-restoring-your-environment.md

@@ -51,7 +51,7 @@ cd entando-de-app
 3. (Optional) Checkout a branch for your desired Entando version. You can review <https://github.com/entando/entando-de-app/releases> to determine the correct tag to use. 
 
 ```sh
-git checkout -b my-test v7.0.0
+git checkout -b my-test v7.1.0
 ```
 :::warning
 If you don't perform this step, you'll be creating an Entando Application based on the latest `entando-de-app` code, which may not yet be released.
@@ -80,9 +80,9 @@ docker push YOUR-USER/entando-de-app-wildfly:YOUR-VERSION
 You can use your typical install steps (or the standard [Manual Install steps](../../docs/getting-started/#manual-install)) with one adjustment. When you get to the `Install namespace scoped resources` step, you'll need to configure the `namespace-resources.yaml` to use your image. 
 
 1. Retrieve a copy of the `namespace-resources.yaml` for your Entando version
-```sh
- curl -sfL https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml > namespace-resources.yaml
-```
+
+<EntandoCode>curl -sfL https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v71}}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml > namespace-resources.yaml</EntandoCode>
+
 
 2. Edit `namespace-resources.yaml` and update the `entando-de-app-wildfly` configuration with your user name and version
 ```yaml

vuepress/docs/next/tutorials/devops/caching-and-clustering.md

@@ -126,7 +126,7 @@ git clone https://github.com/entando/entando-de-app
 git fetch --tags
 ```
 ```sh
-git checkout tags/v7.0.0 -b YOUR-7.0.0-redis
+git checkout tags/v7.1.0 -b YOUR-7.1.0-redis
 ```
 
 3. Open the pom.xml file of the `entando-de-app`.
@@ -145,9 +145,7 @@ git checkout tags/v7.0.0 -b YOUR-7.0.0-redis
 6. Build and push a custom image for the `entando-de-app` with [Building a Docker Image Tutorial](./build-core-image.md).
 7. Download the operator configuration deployment file:
 
-``` sh
-curl -L -C - -O https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/orig/namespace-resources.yaml > namespace-resources.yaml
-```
+<EntandoCode>curl -L -C - -O https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v71}}/dist/ge-1-1-6/namespace-scoped-deployment/orig/namespace-resources.yaml > namespace-resources.yaml</EntandoCode>
 
 8. Update the image for `entando-de-app-wildfly` in the `namespace-resources.yaml` file to point to your custom `entando-de-app` image with Redis. The line to change is in the ConfigMap named `entando-docker-image-info`.
 
@@ -158,9 +156,8 @@ kubectl apply -f namespace-resources.yaml
 ```
 
 10. Download the `entando-app.yaml` template
-```sh
-curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-app.yaml"
-```
+
+<EntandoCode>curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v71}}/dist/ge-1-1-6/samples/entando-app.yaml"</EntandoCode>
 
 11. Add environment variables to the `EntandoApp` definition to match your Redis instance. The variables to create are REDIS_ACTIVE, REDIS_ADDRESS (e.g. _redis://localhost:6379_), and REDIS_PASSWORD.
 

vuepress/docs/next/tutorials/devops/entando-operator.md

@@ -13,9 +13,8 @@ kubectl get configmap -n entando
 
 ## Add a new ConfigMap
 If the ConfigMap doesn't already exist, you can use a template as a starting point.
-```sh
-curl -sfL "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-operator-config.yaml"
-```
+
+<EntandoCode>curl -sfL "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v71}}/dist/ge-1-1-6/samples/entando-operator-config.yaml"</EntandoCode>
 
 Edit `entando-operator-config.yaml` to adjust existing settings or add new ones. You can then apply it to Kubernetes.
 

vuepress/docs/v7.0/docs/getting-started/README.md

@@ -164,15 +164,12 @@ From your Ubuntu shell
 
 1. Install the cluster-scoped custom resource definitions (CRDs)
 
-``` shell
-sudo kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml
-```
+<EntandoCode>sudo kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml</EntandoCode>
 
 2. Install the namespace-scoped custom resources
 
-``` shell
-sudo kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml
-```
+<EntandoCode>sudo kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml</EntandoCode>
+
 #### Configure Access to Your Cluster
 
 ::: tip What about Networking?
@@ -195,9 +192,8 @@ Now that you've determined YOUR-HOST-NAME, use it to configure the Entando Appli
 
 1. Download the template `entando-app.yaml`.
 
-```
-curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-app.yaml"
-```
+<EntandoCode>curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/entando-app.yaml"</EntandoCode>
+
 
 2. Modify `entando-app.yaml` to set the `ingressHostName` to YOUR-HOST-NAME. Examples:
 - `ingressHostName`: quickstart.mshome.net

vuepress/docs/v7.0/tutorials/devops/backing-up-and-restoring-your-environment.md

@@ -80,9 +80,8 @@ docker push YOUR-USER/entando-de-app-wildfly:YOUR-VERSION
 You can use your typical install steps (or the standard [Manual Install steps](../../docs/getting-started/#manual-install)) with one adjustment. When you get to the `Install namespace scoped resources` step, you'll need to configure the `namespace-resources.yaml` to use your image. 
 
 1. Retrieve a copy of the `namespace-resources.yaml` for your Entando version
-```sh
- curl -sfL https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml > namespace-resources.yaml
-```
+
+<EntandoCode>curl -sfL https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml > namespace-resources.yaml</EntandoCode>
 
 2. Edit `namespace-resources.yaml` and update the `entando-de-app-wildfly` configuration with your user name and version
 ```yaml

vuepress/docs/v7.0/tutorials/devops/caching-and-clustering.md

@@ -145,9 +145,8 @@ git checkout tags/v7.0.0 -b YOUR-7.0.0-redis
 6. Build and push a custom image for the `entando-de-app` with [Building a Docker Image Tutorial](./build-core-image.md).
 7. Download the operator configuration deployment file:
 
-``` sh
-curl -L -C - -O https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/orig/namespace-resources.yaml > namespace-resources.yaml
-```
+<EntandoCode>curl -L -C - -O https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/orig/namespace-resources.yaml > namespace-resources.yaml</EntandoCode>
+
 
 8. Update the image for `entando-de-app-wildfly` in the `namespace-resources.yaml` file to point to your custom `entando-de-app` image with Redis. The line to change is in the ConfigMap named `entando-docker-image-info`.
 
@@ -158,9 +157,8 @@ kubectl apply -f namespace-resources.yaml
 ```
 
 10. Download the `entando-app.yaml` template
-```sh
-curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-app.yaml"
-```
+
+<EntandoCode>curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/entando-app.yaml"</EntandoCode>
 
 11. Add environment variables to the `EntandoApp` definition to match your Redis instance. The variables to create are REDIS_ACTIVE, REDIS_ADDRESS (e.g. _redis://localhost:6379_), and REDIS_PASSWORD.
 

vuepress/docs/v7.0/tutorials/devops/entando-operator.md

@@ -13,9 +13,8 @@ kubectl get configmap -n entando
 
 ## Add a new ConfigMap
 If the ConfigMap doesn't already exist, you can use a template as a starting point.
-```sh
-curl -sfL "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-operator-config.yaml"
-```
+
+<EntandoCode>curl -sfL "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/entando-operator-config.yaml"</EntandoCode>
 
 Edit `entando-operator-config.yaml` to adjust existing settings or add new ones. You can then apply it to Kubernetes.
 

vuepress/docs/v7.0/tutorials/getting-started/azure-install.md

@@ -77,18 +77,17 @@ See the [Install Guide for NGINX on Azure](https://kubernetes.github.io/ingress-
 ### Install the Entando Custom Resources
 
 1. Apply the cluster-scoped custom resource definitions (CRDs). This is required only once per cluster.
-```sh
-kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml
-```
+
+<EntandoCode>kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml</EntandoCode>
 
 2. Create the namespace for the Entando Application
 ```sh
 kubectl create namespace entando
 ```
 3. Download the `entando-operator-config` template so you can configure the [Entando Operator](../devops/entando-operator.md) 
-```sh
-curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-operator-config.yaml"
-```
+
+<EntandoCode>curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/entando-operator-config.yaml"</EntandoCode>
+
 4. Edit the `entando-operator-config.yaml` to add two properties
 ```yaml
 data:
@@ -102,9 +101,9 @@ kubectl apply -f entando-operator-config.yaml -n entando
 ```
 
 6. Apply the namespace-scoped custom resources
-```sh
-kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml
-```
+
+<EntandoCode>kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml</EntandoCode>
+
 7. You can use `kubectl get pods -n entando --watch` to see the initial pods start up. Use `Ctrl+C` to exit.
 ```
 $ kubectl get pods -n entando
@@ -115,9 +114,8 @@ entando-operator-5b5465788b-ghb25      1/1     Running   0          5m53s
 
 ### Configure the Entando Application
 1. Download the `entando-app.yaml` template
-```sh
-curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-app.yaml"
-```
+
+<EntandoCode>curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/entando-app.yaml"</EntandoCode>
 
 2. Edit `entando-app.yaml`. Replace `YOUR-HOST-NAME` with `EXTERNAL-IP` + `.nip.io`. See [the EntandoApp custom resource definition](../../docs/consume/entandoapp-cr.md) for additional options.
 ```yaml

vuepress/docs/v7.0/tutorials/getting-started/eks-install.md

@@ -127,18 +127,17 @@ See the [NGINX AWS Guide](https://kubernetes.github.io/ingress-nginx/deploy/#aws
 ### Install the Entando Custom Resources
 
 1. Apply the cluster-scoped custom resource definitions (CRDs). This is required only once per cluster.
-```sh
-kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml
-```
+
+<EntandoCode>kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml</EntandoCode>
 
 2. Create the namespace for the Entando Application
 ```sh
 kubectl create namespace entando
 ```
 3. Download the `entando-operator-config` template so you can configure the [Entando Operator](../devops/entando-operator.md). 
-```sh
-curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-operator-config.yaml"
-```
+
+<EntandoCode>curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/entando-operator-config.yaml"</EntandoCode>
+
 4. Edit the `entando-operator-config.yaml` to set `data/entando.requires.filesystem.group.override: "true"`
 ```yaml
 data:
@@ -152,9 +151,9 @@ kubectl apply -f entando-operator-config.yaml -n entando
 ```
 
 6. Apply the namespace-scoped custom resources
-```sh
-kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml
-```
+
+<EntandoCode>kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml</EntandoCode>
+
 7. You can use `kubectl get pods -n entando --watch` to see the initial pods start up. Use `Ctrl+C` to exit.
 ```
 $ kubectl get pods -n entando
@@ -165,9 +164,8 @@ entando-operator-5b5465788b-ghb25      1/1     Running   0          5m53s
 
 ### Configure the Entando Application
 1. Download the `entando-app.yaml` template
-```sh
-curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-app.yaml"
-```
+
+<EntandoCode>curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/entando-app.yaml"</EntandoCode>
 
 2. Edit `entando-app.yaml` and replace YOUR-HOST-NAME with the NGINX address from above. See the [EntandoApp Custom Resource Definitions](../../docs/consume/entandoapp-cr.md) for details on other options.
 ```yaml

vuepress/docs/v7.0/tutorials/getting-started/gke-install.md

@@ -69,17 +69,17 @@ NGINX is working correctly if a `404 Not Found` NGINX error page is generated wh
 ### Install the Entando Custom Resources
 
 1. Download and apply the custom resource definitions (CRDs) to the cluster. This must be done once per cluster.
-```sh
-kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml
-```
+
+<EntandoCode>kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml</EntandoCode>
+
 2. Create a namespace for the Entando Application. If you choose a name other than "entando," update the following commands wherever a namespace is provided.
 ```sh
 kubectl create namespace entando
 ```
 3. Download the `entando-operator-config` template to configure the [Entando Operator](../devops/entando-operator.md)
-```sh
-curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-operator-config.yaml"
-```
+
+<EntandoCode>curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/entando-operator-config.yaml"</EntandoCode>
+
 4. Edit the `entando-operator-config.yaml` to add two properties
 ```yaml
 data:
@@ -91,9 +91,9 @@ data:
 kubectl apply -f entando-operator-config.yaml -n entando
 ````
 6. Install the namespace-scoped resources
-```sh
-kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml
-```
+
+<EntandoCode>kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml</EntandoCode>
+
 7. Use `kubectl get pods -n entando --watch` to observe the base pods initialize. Exit this command via `Ctrl+C`.
 ```sh
 $ kubectl get pods -n entando
@@ -104,10 +104,8 @@ entando-operator-5b5465788b-ghb25      1/1     Running   0          95s
 
 ### Configure the Entando Application
 1. Download the `entando-app.yaml` template
-```sh
-curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-app.yaml"
-```
 
+<EntandoCode>curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/entando-app.yaml"</EntandoCode>
 
 2. Edit `entando-app.yaml`. Replace `YOUR-HOST-NAME` with `EXTERNAL-IP` + `.nip.io`. See [the EntandoApp custom resource definition](../../docs/consume/entandoapp-cr.md) for additional options.
 

vuepress/docs/v7.0/tutorials/getting-started/openshift-install-by-operator.md

@@ -15,9 +15,8 @@ Scenario 1 is similar to the Entando quickstart style of deployment which can be
 
 ## Add the Entando Operator to the OperatorHub
 A cluster admin can add the 7.0 version of the Entando Operator into the local OperatorHub using the following command.
-```shell
-oc apply -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/openshift-catalog-source.yaml
-```
+
+<EntandoCode>oc apply -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/openshift-catalog-source.yaml</EntandoCode>
 
 ## Scenario 1 - Embedded Database
 The initial scenario deploys the operator and Entando Application into a single namespace. We start with the smallest application footprint by using an embedded database, although this is not recommended for production use cases.

vuepress/docs/v7.0/tutorials/getting-started/openshift-install.md

@@ -25,9 +25,8 @@ oc login --token=sha256~TO3QCeoLSbprlGZARBOBVAoaKFeb9Ag0RxztYifAcjE --server=htt
 - Use the command line interface from the OpenShift Console .
 
 2. Install the cluster-scoped custom resource definitions (CRDs). This step is only required once per cluster.
-```shell
-oc apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml
-```
+
+<EntandoCode>oc apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml</EntandoCode>
 
 3. Create the project for your application
 ```
@@ -39,17 +38,15 @@ The remaining steps in this tutorial can be performed by a user with project-lev
 
 ## Configure the Project
 1. Install the namespace-scoped custom resources
-```
-oc apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml
-```
+
+<EntandoCode>oc apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml</EntandoCode>
 
 2. (Optional) A ConfigMap can be used to modify the behavior of the Entando Operator. Refer to the [Entando Operator](../../tutorials/devops/entando-operator.md) page for more information.
 
 ## Configure the Entando Application
 1. Download the `entando-app.yaml` template
-```sh
-curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-app.yaml"
-```
+
+<EntandoCode>curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{$site.themeConfig.entando.fixpack.v70}}/dist/ge-1-1-6/samples/entando-app.yaml"</EntandoCode>
 
 2. Determine the hostname for your application, YOUR-HOST-NAME
   - If you're deploying to a managed cluster: