Updates FHIR Data Pipes setup tutorial documentation (#1516)

Author: ndegwamartin

doc/docs/tutorials/index.md

@@ -3,9 +3,9 @@
 In this section you can access tutorials to learn about different aspects of
 working with FHIR Data Pipes.
 
+- **[Set up local test servers:](test_servers)** Set up local HAPI FHIR server
+  and load it with synthetic data
 - **[Single Machine Deployment:](single_machine)** Great for getting started
   quickly and evaluating FHIR Data Pipes
 - **[Visualize Parquet DWH with Apache Superset:](add_dashboard)** With the
   Pipelines set-up, learn how to visualize the data using Apache Superset
-- **[Set up local test servers:](test_servers)** Set up local HAPI FHIR server
-  and load it with synthetic data

doc/docs/tutorials/single_machine.md

@@ -14,7 +14,7 @@ To learn how the Pipelines Controller works on its own, try out the
 - A source [HAPI FHIR server](https://hapifhir.io/) configured to
   [use Postgres as its database](https://github.com/hapifhir/hapi-fhir-jpaserver-starter#postgresql-configuration)
   - If you don't have a server, use a
-    [local test server](https://github.com/google/fhir-data-pipes/wiki/Try-the-pipelines-using-local-test-servers)
+    [local test server](https://google.github.io/fhir-data-pipes/tutorials/test_servers/)
     by following the instructions to bring up a source HAPI FHIR server with
     Postgres
 - [Docker](https://www.docker.com/)
@@ -80,7 +80,7 @@ For documentation of all config parameters, see
 [here](https://github.com/google/fhir-data-pipes/blob/master/pipelines/controller/config/application.yaml).
 
 **Note:** If you are using the
-[local test servers](https://github.com/google/fhir-data-pipes/wiki/Try-the-pipelines-using-local-test-servers),
+[local test servers](https://google.github.io/fhir-data-pipes/tutorials/test_servers/),
 things should work with the default values. If not, use the IP address of the
 Docker default bridge network. To find it, run the following command and use the
 "Gateway" value:

doc/docs/tutorials/test_servers.md

@@ -14,6 +14,10 @@ There are _3 Docker server_ configurations you can use for testing:
 
 **Note**: All commands are run from the root directory of the repository.
 
+!!! info "Information" This tutorial has been updated to use `docker compose`
+instead of `docker-compose`. If you have an older version of Docker that does
+not support `docker compose`, you can continue to use `docker-compose` commands.
+
 1.  Create an external Docker network named `cloudbuild`:
 
     ```
@@ -84,7 +88,7 @@ There are _3 Docker server_ configurations you can use for testing:
     [HAPI FHIR server](https://github.com/google/fhir-data-pipes/blob/master/docker/sink-compose.yml):
 
     ```shell
-    docker-compose  -f ./docker/sink-compose.yml up  --force-recreate -d
+    docker compose  -f ./docker/sink-compose.yml up  --force-recreate -d
     ```
 
     The base URL for this server is `http://localhost:8098/fhir`.
@@ -96,17 +100,17 @@ username "admin" and password "Admin123". The Docker image includes the required
 FHIR2 module and demo data. Edit `docker/openmrs-compose.yaml` to change the
 default port.
 
-**Note:** If `docker-compose` fails, you may need to adjust file permissions. In
+**Note:** If `docker compose` fails, you may need to adjust file permissions. In
 particular if the permissions on `mysqld.cnf` is not right, the `datadir` set in
 this file will not be read by MySQL and it will cause OpenMRS to require its
 `initialsetup` (which is not needed since the MySQL image already has all the
 data and tables needed):
 
 ```shell
-$ docker-compose -f docker/openmrs-compose.yaml down -v
+$ docker compose -f docker/openmrs-compose.yaml down -v
 $ chmod a+r docker/mysql-build/mysqld.cnf
 $ chmod -R a+r ./utils
-$ docker-compose -f docker/openmrs-compose.yaml up
+$ docker compose -f docker/openmrs-compose.yaml up
 ```
 
 In order to see the demo data in OpenMRS you must rebuild the search index. In

doc/mkdocs.yml

@@ -56,10 +56,10 @@ nav:
     - 'Deploy the "Controller Module"' : 'installation_controller.md'
     - 'Deploy the "Pipelines"' : 'installation_pipeline.md'
   - Tutorials:
-    - tutorials/index.md
-    - Set up local test servers : tutorials/test_servers.md
-    - Single Machine Deployment:  tutorials/single_machine.md
-    - Visualize Parquet DWH with Apache Superset: tutorials/add_dashboard.md
+    - Content : tutorials/index.md
+    - Step 1 - Set up local test servers(Data) : tutorials/test_servers.md
+    - Step 2 - Single Machine Deployment(Pipeline):  tutorials/single_machine.md
+    - Step 3 - Visualize Parquet DWH with Apache Superset: tutorials/add_dashboard.md
   - Additional Topics: 'additional.md'
   - Community:
     - 'Support' : 'support.md'