WMS 12066 - First version + small fixes in on previous labs.

oci-starter-lab/container_instance/container_instance.md

@@ -57,28 +57,29 @@ Please read the chapter: Introduction and Get Started.
     ![Editor File Open](../public_compute/images/starter-compute-dir.png)
 2. The main files are:
 
-   |             |            |           | Description |
-   | ----------- | ---------- | --------- | ---|
-   | Commands    |            |           |  |
-   |             | starter.sh |           | Build or destroy a project. Show a menu with commands if not argument is given | 
-   |             | env.sh     |           | Settings of your project | 
-   | Directories |            |           | Commands used by starter.sh | 
-   |             | bin/       |           | Commands used by starter.sh | 
-   |             | src/       |           | Sources files | 
-   |             |            | app       | Backend Application (Command: build_app.sh) | 
-   |             |            | ui        | User Interface (Command: build_ui.sh) | 
-   |             |            | db        | Database initialisation files (SQL, ...) | 
-   |             |            | terraform | Terraform scripts  | 
-   |             | target/    |           | Output directory  | 
-
-3. (Optional) Edit the env.sh file:
-    - Choose the env.sh file.
+   |             |                  |           |           | Description |
+   | ----------- | ---------------- | --------- | --------- | ---|
+   | Commands    |                  |           |           |  |
+   |             | starter.sh       |           |           | Build or destroy a project. Show a menu with commands if not argument is given | 
+   |             | terraform.tfvars |           |           | Settings of your project | 
+   | Directories |                  |           |           | Commands used by starter.sh | 
+   |             | bin/             |           |           | Commands used by starter.sh | 
+   |             | src/             |           |           | Sources files | 
+   |             |                  | app       |           | Applications | 
+   |             |                  |           | rest      | App - Rest | 
+   |             |                  |           | ui        | App - UI - User Interface | 
+   |             |                  |           | db        | App - Database (initialisation files, SQL, ...) | 
+   |             |                  | terraform |           | Terraform scripts  | 
+   |             | target/          |           |           | Output directory  | 
+  
+3. Edit the terraform.tfvars file:
     - Look for \_\_TO_FILL\_\_ in the file
     - You may leave it like this.
         - If not filled, the "db password" will be randomly generated
     - Ideally, you can also use an existing compartment if you have one. 
-        - If not, the script will create a "oci-starter" compartment
-    ![Editor env.sh](../public_compute/images/starter-compute-env.png)
+        - If not, the script will ask to reuse one or to create an "oci-starter" compartment
+    ![Editor terraform.tfvars](../public_compute/images/starter-compute-env.png)
+
 
 ## Task 3: Starter.sh
 

oci-starter-lab/function/function.md

@@ -54,29 +54,28 @@ Please read the chapter: Introduction and Get Started.
     - Click *Open*
     ![Editor File Open](../public_compute/images/starter-compute-dir.png)
 2. The main files are:
-
-   |             |            |           | Description |
-   | ----------- | ---------- | --------- | ---|
-   | Commands    |            |           |  |
-   |             | starter.sh |           | Build or destroy a project. Show a menu with commands if not argument is given | 
-   |             | env.sh     |           | Settings of your project | 
-   | Directories |            |           | Commands used by starter.sh | 
-   |             | bin/       |           | Commands used by starter.sh | 
-   |             | src/       |           | Sources files | 
-   |             |            | app       | Backend Application (Command: build_app.sh) | 
-   |             |            | ui        | User Interface (Command: build_ui.sh) | 
-   |             |            | db        | Database initialisation files (SQL, ...) | 
-   |             |            | terraform | Terraform scripts  | 
-   |             | target/    |           | Output directory  | 
-
-3. Edit the env.sh file:
-    - Choose the env.sh file.
+   |             |                  |           |           | Description |
+   | ----------- | ---------------- | --------- | --------- | ---|
+   | Commands    |                  |           |           |  |
+   |             | starter.sh       |           |           | Build or destroy a project. Show a menu with commands if not argument is given | 
+   |             | terraform.tfvars |           |           | Settings of your project | 
+   | Directories |                  |           |           | Commands used by starter.sh | 
+   |             | bin/             |           |           | Commands used by starter.sh | 
+   |             | src/             |           |           | Sources files | 
+   |             |                  | app       |           | Applications | 
+   |             |                  |           | rest      | App - Rest | 
+   |             |                  |           | ui        | App - UI - User Interface | 
+   |             |                  |           | db        | App - Database (initialisation files, SQL, ...) | 
+   |             |                  | terraform |           | Terraform scripts  | 
+   |             | target/          |           |           | Output directory  | 
+
+3. Edit the terraform.tfvars file:
     - Look for \_\_TO_FILL\_\_ in the file
-    - For TF\_VAR\_database\_password, You may leave it like this.
+    - You may leave it like this.
         - If not filled, the "db password" will be randomly generated
     - Ideally, you can also use an existing compartment if you have one. 
-        - If not, the script will create a "oci-starter" compartment
-    ![Editor env.sh](../public_compute/images/starter-compute-env.png)
+        - If not, the script will ask to reuse one or to create an "oci-starter" compartment
+    ![Editor terraform.tfvars](../public_compute/images/starter-compute-env.png)
 
 ## Task 3: Starter.sh
 

oci-starter-lab/instance_pool/instance_pool.md

@@ -62,29 +62,29 @@ Please read the chapter: Introduction and Get Started.
     ![Editor File Open](../public_compute/images/starter-compute-dir.png)
 2. The main files are:
 
-   |             |            |           | Description |
-   | ----------- | ---------- | --------- | ---|
-   | Commands    |            |           |  |
-   |             | starter.sh |           | Build or destroy a project. Show a menu with commands if not argument is given | 
-   |             | env.sh     |           | Settings of your project | 
-   | Directories |            |           | Commands used by starter.sh | 
-   |             | bin/       |           | Commands used by starter.sh | 
-   |             | src/       |           | Sources files | 
-   |             |            | app       | Backend Application (Command: build_app.sh) | 
-   |             |            | ui        | User Interface (Command: build_ui.sh) | 
-   |             |            | db        | Database initialisation files (SQL, ...) | 
-   |             |            | terraform | Terraform scripts  | 
-   |             |            | compute   | Deployment to Compute | 
-   |             | target/    |           | Output directory  | 
-
-3. Edit the env.sh file:
-    - Choose the env.sh file.
+   |             |                  |           |           | Description |
+   | ----------- | ---------------- | --------- | --------- | ---|
+   | Commands    |                  |           |           |  |
+   |             | starter.sh       |           |           | Build or destroy a project. Show a menu with commands if not argument is given | 
+   |             | terraform.tfvars |           |           | Settings of your project | 
+   | Directories |                  |           |           | Commands used by starter.sh | 
+   |             | bin/             |           |           | Commands used by starter.sh | 
+   |             | src/             |           |           | Sources files | 
+   |             |                  | app       |           | Applications | 
+   |             |                  |           | rest      | App - Rest | 
+   |             |                  |           | ui        | App - UI - User Interface | 
+   |             |                  |           | db        | App - Database (initialisation files, SQL, ...) | 
+   |             |                  | terraform |           | Terraform scripts  | 
+   |             | target/          |           |           | Output directory  | 
+
+  
+3. Edit the terraform.tfvars file:
     - Look for \_\_TO_FILL\_\_ in the file
     - You may leave it like this.
         - If not filled, the "db password" will be randomly generated
     - Ideally, you can also use an existing compartment if you have one. 
-        - If not, the script will create a "oci-starter" compartment
-    ![Editor env.sh](../public_compute/images/starter-compute-env.png)
+        - If not, the script will ask to reuse one or to create an "oci-starter" compartment
+    ![Editor terraform.tfvars](../public_compute/images/starter-compute-env.png)
 
 ## Task 3: Starter.sh
 
@@ -175,5 +175,5 @@ Please also check the  "Lab 7 - How to Customize" to see how to customize this s
 
 * Author - Marc Gueury
 * Contributors - Ewan Slater 
-* Last Updated - Jan, 20th 2025
+* Last Updated - June, 2nd 2025
 

oci-starter-lab/kubernetes/kubernetes.md

@@ -56,29 +56,30 @@ Please read the chapter: Introduction and Get Started.
     ![Editor File Open](../public_compute/images/starter-compute-dir.png)
 2. The main files are:
 
-   |             |            |           | Description |
-   | ----------- | ---------- | --------- | ---|
-   | Commands    |            |           |  |
-   |             | starter.sh |           | Build or destroy a project. Show a menu with commands if not argument is given | 
-   |             | env.sh     |           | Settings of your project | 
-   | Directories |            |           | Commands used by starter.sh | 
-   |             | bin/       |           | Commands used by starter.sh | 
-   |             | src/       |           | Sources files | 
-   |             |            | app       | Backend Application (Command: build_app.sh) | 
-   |             |            | ui        | User Interface (Command: build_ui.sh) | 
-   |             |            | db        | Database initialisation files (SQL, ...) | 
-   |             |            | terraform | Terraform scripts  | 
-   |             |            | oke       | Deployment to Kubernetes | 
-   |             | target/    |           | Output directory  | 
-
-5. Edit the env.sh file:
-    - Choose the env.sh file.
+   |             |                  |           |           | Description |
+   | ----------- | ---------------- | --------- | --------- | ---|
+   | Commands    |                  |           |           |  |
+   |             | starter.sh       |           |           | Build or destroy a project. Show a menu with commands if not argument is given | 
+   |             | terraform.tfvars |           |           | Settings of your project | 
+   | Directories |                  |           |           | Commands used by starter.sh | 
+   |             | bin/             |           |           | Commands used by starter.sh | 
+   |             | src/             |           |           | Sources files | 
+   |             |                  | app       |           | Applications | 
+   |             |                  |           | rest      | App - Rest | 
+   |             |                  |           | ui        | App - UI - User Interface | 
+   |             |                  |           | db        | App - Database (initialisation files, SQL, ...) | 
+   |             |                  | terraform |           | Terraform scripts  | 
+   |             |                  | oke       |           | Deployment to Kubernetes | 
+   |             | target/          |           |           | Output directory  | 
+
+
+3. Edit the terraform.tfvars file:
     - Look for \_\_TO_FILL\_\_ in the file
-    - For TF\_VAR\_database\_password, You may leave it like this.
+    - You may leave it like this.
         - If not filled, the "db password" will be randomly generated
     - Ideally, you can also use an existing compartment if you have one. 
-        - If not, the script will create a "oci-starter" compartment
-    ![Editor env.sh](../public_compute/images/starter-compute-env.png)
+        - If not, the script will ask to reuse one or to create an "oci-starter" compartment
+    ![Editor terraform.tfvars](../public_compute/images/starter-compute-env.png)
 
 ## Task 3: Starter.sh
 

oci-starter-lab/private_compute/private_compute.md

@@ -60,29 +60,28 @@ Please read the chapter: Introduction and Get Started.
     ![Editor File Open](../public_compute/images/starter-compute-dir.png)
 2. The main files are:
 
-   |             |            |           | Description |
-   | ----------- | ---------- | --------- | ---|
-   | Commands    |            |           |  |
-   |             | starter.sh |           | Build or destroy a project. Show a menu with commands if not argument is given | 
-   |             | env.sh     |           | Settings of your project | 
-   | Directories |            |           | Commands used by starter.sh | 
-   |             | bin/       |           | Commands used by starter.sh | 
-   |             | src/       |           | Sources files | 
-   |             |            | app       | Backend Application (Command: build_app.sh) | 
-   |             |            | ui        | User Interface (Command: build_ui.sh) | 
-   |             |            | db        | Database initialisation files (SQL, ...) | 
-   |             |            | terraform | Terraform scripts  | 
-   |             |            | compute   | Deployment to Compute | 
-   |             | target/    |           | Output directory  | 
-
-3. Edit the env.sh file:
-    - Choose the env.sh file.
+   |             |                  |           |           | Description |
+   | ----------- | ---------------- | --------- | --------- | ---|
+   | Commands    |                  |           |           |  |
+   |             | starter.sh       |           |           | Build or destroy a project. Show a menu with commands if not argument is given | 
+   |             | terraform.tfvars |           |           | Settings of your project | 
+   | Directories |                  |           |           | Commands used by starter.sh | 
+   |             | bin/             |           |           | Commands used by starter.sh | 
+   |             | src/             |           |           | Sources files | 
+   |             |                  | app       |           | Applications | 
+   |             |                  |           | rest      | App - Rest | 
+   |             |                  |           | ui        | App - UI - User Interface | 
+   |             |                  |           | db        | App - Database (initialisation files, SQL, ...) | 
+   |             |                  | terraform |           | Terraform scripts  | 
+   |             | target/          |           |           | Output directory  |  
+
+3. Edit the terraform.tfvars file:
     - Look for \_\_TO_FILL\_\_ in the file
     - You may leave it like this.
         - If not filled, the "db password" will be randomly generated
     - Ideally, you can also use an existing compartment if you have one. 
-        - If not, the script will create a "oci-starter" compartment
-    ![Editor env.sh](../public_compute/images/starter-compute-env.png)
+        - If not, the script will ask to reuse one or to create an "oci-starter" compartment
+    ![Editor terraform.tfvars](../public_compute/images/starter-compute-env.png)
 
 ## Task 3: Starter.sh
 

oci-starter-lab/public_compute/public_compute.md

@@ -57,29 +57,28 @@ Please read the chapter: Introduction and Get Started.
     ![Editor File Open](images/starter-compute-dir.png)
 2. The main files are:
 
-   |             |            |           | Description |
-   | ----------- | ---------- | --------- | ---|
-   | Commands    |            |           |  |
-   |             | starter.sh |           | Build or destroy a project. Show a menu with commands if not argument is given | 
-   |             | env.sh     |           | Settings of your project | 
-   | Directories |            |           | Commands used by starter.sh | 
-   |             | bin/       |           | Commands used by starter.sh | 
-   |             | src/       |           | Sources files | 
-   |             |            | app       | Backend Application (Command: build_app.sh) | 
-   |             |            | ui        | User Interface (Command: build_ui.sh) | 
-   |             |            | db        | Database initialisation files (SQL, ...) | 
-   |             |            | terraform | Terraform scripts  | 
-   |             |            | compute   | Deployment to Compute | 
-   |             | target/    |           | Output directory  | 
-
-3. Edit the env.sh file:
-    - Choose the env.sh file.
+   |             |                  |           |           | Description |
+   | ----------- | ---------------- | --------- | --------- | ---|
+   | Commands    |                  |           |           |  |
+   |             | starter.sh       |           |           | Build or destroy a project. Show a menu with commands if not argument is given | 
+   |             | terraform.tfvars |           |           | Settings of your project | 
+   | Directories |                  |           |           | Commands used by starter.sh | 
+   |             | bin/             |           |           | Commands used by starter.sh | 
+   |             | src/             |           |           | Sources files | 
+   |             |                  | app       |           | Applications | 
+   |             |                  |           | rest      | App - Rest | 
+   |             |                  |           | ui        | App - UI - User Interface | 
+   |             |                  |           | db        | App - Database (initialisation files, SQL, ...) | 
+   |             |                  | terraform |           | Terraform scripts  | 
+   |             | target/          |           |           | Output directory  |  
+
+3. Edit the terraform.tfvars file:
     - Look for \_\_TO_FILL\_\_ in the file
     - You may leave it like this.
         - If not filled, the "db password" will be randomly generated
     - Ideally, you can also use an existing compartment if you have one. 
         - If not, the script will ask to reuse one or to create an "oci-starter" compartment
-    ![Editor env.sh](images/starter-compute-env.png)
+    ![Editor terraform.tfvars](images/starter-compute-env.png)
 
 ## Task 3: Starter.sh