Skip to content

Commit

Permalink
Amine changes (#261)
Browse files Browse the repository at this point in the history
* Dev using gitpod

Signed-off-by: Amine RACHYD <aminerachyd99@gmail.com>

* Updated gitpod access documentation

Signed-off-by: Amine RACHYD <aminerachyd99@gmail.com>

* Fix spelling

Signed-off-by: Amine RACHYD <aminerachyd99@gmail.com>

* Gitpod org access

Signed-off-by: Amine RACHYD <aminerachyd99@gmail.com>

* Fix typos

Signed-off-by: Amine RACHYD <aminerachyd99@gmail.com>

* Fix typos

Signed-off-by: Amine RACHYD <aminerachyd99@gmail.com>

* Fix typos

Signed-off-by: Amine RACHYD <aminerachyd99@gmail.com>

Signed-off-by: Amine RACHYD <aminerachyd99@gmail.com>
  • Loading branch information
aminerachyd authored Aug 23, 2022
1 parent 10fdd75 commit c80286d
Show file tree
Hide file tree
Showing 14 changed files with 122 additions and 238 deletions.
28 changes: 9 additions & 19 deletions docs/developer-advanced-1/database-with-cloudant/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Database with Cloudant
---

<!--- cSpell:ignore dataload cloudantcredentials apikey classname gradlew viewapp cloudantgitpodscreen crwopenlink crwopenapp -->
<!--- cSpell:ignore dataload cloudantcredentials apikey classname gradlew viewapp cloudantgitpodscreen crwopenlink crwopenapp gitpodapplaunch gitpodexplorer -->

## Add a Cloudant integration to your backend service

Expand Down Expand Up @@ -638,42 +638,32 @@ existing `env` block
- name: DATABASE_NAME
value: {{ .Values.databaseName | quote }}
```
### Running the application locally
### Running the application
- Start the application.
```bash
./gradlew build
./gradlew bootrun
```
=== "Cloud Shell"
- To view the running app click on the **Eye Icon** on the top right and select the port `9080` this will open a browser tab and display the running app on that port.
![View App](images/viewapp.png)
=== "Gitpod"
- Once you run the application,gitpod gives the option to make the port "Public".Once you make the port Public, it gives you the option to "Open Preview" or "Open Browser".
- Gitpod should prompt you to make your app public, make it so
![View App](images/gitpod01.png)
![View App](../../images/common/gitpodapplaunch.png)
- Selecting "Open Preview" opens a window inside gitpod workspace tab.
- Go to the **Remote explorer** tab at the left of the Gitpod editor, you should see the port where your application is running. Click on the **open browser** button
![OpenPreview](images/cloudantgitpodscreen.png)
![OpenPreview](../../images/common/gitpodexplorer.png)
- Selecting "Open Browser" opens a new browser tab for accessing the URL.
=== "Cloud Ready Workspaces"
- Click on open link
![CRW Open Link](images/crwopenlink.png)
- You should see the swagger-ui window open
- To view this application in new tab click top right corner arrow icon
![CRW Open App](images/crwopenapp.png)
=== "Desktop/Laptop"
=== "Locally"
- Open a browser to [`http://localhost:9080/swagger-ui.html`](http://localhost:9080:swagger-ui.html)
---
- Once the application is up, go the Swagger UI and execute get `stock-items`.
- You should be able to see all the data you pushed to the database
through ./dataload.sh
- You should be able to see all the data you pushed to the database through ./dataload.sh
![ResultScreen](images/ResultScreen.png)
Expand Down
28 changes: 2 additions & 26 deletions docs/developer-advanced-1/database-with-mongodb/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -367,35 +367,11 @@ If you are starting from the solution, use the following steps to enable the Clo
!!! tip
If you are using MongoDB on **OpenShift**, you can use the `oc port-forward` command to access your database instance through `localhost`


=== "Cloud Shell"
- To view the running app click on the **Eye Icon** on the top right and select the port `9080` this will open a browser tab and display the running app on that port.

![View App](../../images/database-with-cloudant/viewapp.png)
=== "Gitpod"
- Once you run the application,gitpod gives the option to make the port "Public".Once you make the port Public, it gives you the option to "Open Preview" or "Open Browser".

![View App](../../images/database-with-cloudant/gitpod01.png)

- Selecting "Open Preview" opens a window inside gitpod workspace tab.

![OpenPreview](../../images/database-with-cloudant/cloudantgitpodscreen.png)

- Selecting "Open Browser" opens a new browser tab for accessing the URL.
=== "Cloud Ready Workspaces"
- Click on open link
![CRW Open Link](../../images/database-with-cloudant/crwopenlink.png)

- To view this application in new tab click top right corner arrow icon
![CRW Open App](../../images/database-with-cloudant/crwopenapp.png)
=== "Desktop/Laptop"
- Open a browser to [`http://localhost:9080/swagger-ui.html`](http://localhost:9080:swagger-ui.html)
---
- Open a browser to [`http://localhost:9080/swagger-ui.html`](http://localhost:9080:swagger-ui.html)

- Once the application is up, go the Swagger UI and execute get `stock-items`.

- You should be able to see all the data you pushed to the database
through ./dataload.sh
- You should be able to see all the data you pushed to the database through ./dataload.sh

![ResultScreen](../../images/database-with-cloudant/ResultScreen.png)

Expand Down
28 changes: 14 additions & 14 deletions docs/developer-intermediate/inventory-prebuilt-solution/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,51 +14,51 @@ In some cases with self pace hands on labs you may not get everything working. C

- Create a new project from the [Inventory Management Service solution template](https://github.com/ibm-ecosystem-lab/inventory-management-svc-intermediate/generate)
named `inv-man-svc-sol-{initials}`
- replacing `{initials}` with your actual initials
- Replacing `{initials}` with your actual initials

- Clone the repository to your local machine

- Go into the repository directory cloned and execute the following
- Go into the cloned repository directory and execute the following command :

```
oc sync dev-{your initials}
```
- Register the pipeline [register the pipeline](/developer-intermediate/deploy-app#5.-register-the-application-in-a-devops-pipeline)
- Register the pipeline : [register the pipeline](/developer-intermediate/deploy-app#5.-register-the-application-in-a-devops-pipeline)
```
oc pipeline <git repo url> --tekton
```
- Execution of the above command. Give git credentials if prompted, and master as the git branch to use. When prompted for the pipeline, select `ibm-java-gradle`.
- Execution of the above command. Give git credentials if prompted, and **master** as the git branch to use. When prompted for the pipeline, select `ibm-java-gradle`.
- Open the [pipeline to see it running](/developer-intermediate/deploy-app/#6-view-your-application-pipeline)
### Inventory BFF
- Create a new project from the [Inventory Management BFF solution template](https://github.com/ibm-ecosystem-lab/inventory-bff-prebuild/generate)
named `inventory-management-bff-solution-{initials}`
- replacing `{initials}` with your actual initials
- Replacing `{initials}` with your actual initials
- Go into the repository directory cloned and execute the following, if you have not executed it previously:
- Go into the cloned repository directory and execute the following, if you have not executed it previously:
```
oc sync dev-{your initials}
```
- Register the pipeline [register the pipeline](/developer-intermediate/deploy-app#5.-register-the-application-in-a-devops-pipeline)
- Register the pipeline : [register the pipeline](/developer-intermediate/deploy-app#5.-register-the-application-in-a-devops-pipeline)
```
oc pipeline --tekton
```
- Execution of the above command. Give git credentials if prompted, and master as the git branch to use. When prompted for the pipeline, select `igc-nodejs-v1-2-0`.
- Execution of the above command. Give git credentials if prompted, and **master** as the git branch to use. When prompted for the pipeline, select `igc-nodejs-v1-2-0`.
- Open the [pipeline to see it running](/developer-intermediate/deploy-app/#6-view-your-application-pipeline)
- Get the backend service name this value by executing the command `oc get svc -n dev-{initials}.
```
$ oc get svc -n dev-ar
$ oc get svc -n dev-ar
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
inventory-bff-ar ClusterIP 172.21.180.68 <none> 80/TCP 14m
inventory-svc-ar ClusterIP 172.21.4.95 <none> 80/TCP 20m
Expand All @@ -79,26 +79,26 @@ service of the microservice: `connectsTo: inventory-svc-ar`
- Create a new project from the [Inventory Management UI solution template](https://github.com/ibm-ecosystem-lab/inventory-ui-prebuild/generate)
named `inventory-management-ui-solution-{initials}`
- replacing `{initials}` with your actual initials
- Replacing `{initials}` with your actual initials
- Clone the repository to your local machine
- Go into the repository directory cloned and execute the following, if you have not executed it previously:
- Go into the cloned repository directory and execute the following, if you have not executed it previously:
```
oc sync dev-{your initials}
```
- Register the pipeline [register the pipeline](/developer-intermediate/deploy-app#5.-register-the-application-in-a-devops-pipeline)
- Register the pipeline : [register the pipeline](/developer-intermediate/deploy-app#5.-register-the-application-in-a-devops-pipeline)
```
oc pipeline --tekton
```
- Execution of the above command. Give git credentials if prompted, and master as the git branch to use. When prompted for the pipeline, select `igc-nodejs-v1-2-0`.
- Execution of the above command. Give git credentials if prompted, and **master** as the git branch to use. When prompted for the pipeline, select `igc-nodejs-v1-2-0`.
- Open the [pipeline to see it running](/developer-intermediate/deploy-app/#6-view-your-application-pipeline).
- Get the bff service name this value by executing the command `oc get svc -n dev-{initials}.
- Get the bff service name this value by executing the command `oc get svc -n dev-{initials}`.
```
$ oc get svc -n dev-ar
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
Expand Down
Loading

0 comments on commit c80286d

Please sign in to comment.