Merge pull request #118 from redhat-developer-demos/doc

small improvements to tutorial

Author: kdubois

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 FROM quay.io/rhdevelopers/quarkus-maven-repo-cache as cachier
 
 
-FROM quay.io/rhdevelopers/tutorial-tools:0.0.6 
+FROM quay.io/rhdevelopers/tutorial-tools:0.0.7 
 
 COPY --from=cachier /work/m2repo $DEVELOPER_HOME/.m2/repository
 

documentation/modules/ROOT/pages/_partials/compile-and-run.adoc

@@ -1,4 +1,4 @@
-[tabs]
+[tabs%sync]
 ====
 JVM mode::
 +

documentation/modules/ROOT/pages/basics.adoc

@@ -4,8 +4,9 @@
 
 == Creating a Quarkus Application
 
-[tabs]
+[tabs%sync]
 ====
+
 Maven::
 + 
 --
@@ -19,12 +20,11 @@ mvn "io.quarkus.platform:quarkus-maven-plugin:create" \
 -Dextensions='resteasy-reactive'
 cd {project-name}
 ----
-
 --
 Quarkus CLI::
 +
 --
-The quarkus command lets you create projects, manage extensions and do essential build and dev commands using the underlying project build tool.
+The quarkus CLI tool lets you create projects, manage extensions and do essential dev, build and deploy commands using the underlying project build tool in a simplified way. 
 
 Follow these instructions to install Quarkus CLI: https://quarkus.io/guides/cli-tooling
 
@@ -37,7 +37,6 @@ quarkus create app \
   com.redhat.developers:tutorial-app:1.0-SNAPSHOT
 cd {project-name}
 ----
-
 --
 ====
 
@@ -87,7 +86,7 @@ When running this test, the application is started once, then all tests are exec
 
 You can run the test in your IDE or by running the following:
 
-[tabs]
+[tabs%sync]
 ====
 Maven::
 + 
@@ -136,7 +135,7 @@ This is probably one of the best features of Quarkus: enabling a very fast and p
 
 Let's start the _Live Coding_ mode by invoking `mvn`. You probably won't need to stop/start Quarkus again during this tutorial:
 
-[tabs]
+[tabs%sync]
 ====
 Maven::
 + 

documentation/modules/ROOT/pages/setup.adoc

@@ -4,7 +4,7 @@ include::../_attributes.adoc
 
 == IDE
 
-You can use any Java IDE for this tutorial but if you didn't try it before, we recommend https://code.visualstudio.com/download[VS Code, window="_blank"] with the https://marketplace.visualstudio.com/items?itemName=redhat.java[Language Support for Java(TM) by Red Hat, window="_blank"] and the https://marketplace.visualstudio.com/items?itemName=redhat.vscode-quarkus[Quarkus, window="_blank"] extensions.
+You can use any Java IDE for this tutorial but if you haven't tried it before, we recommend https://code.visualstudio.com/download[VS Code, window="_blank"] with the https://marketplace.visualstudio.com/items?itemName=redhat.java[Language Support for Java(TM) by Red Hat, window="_blank"] and the https://marketplace.visualstudio.com/items?itemName=redhat.vscode-quarkus[Quarkus, window="_blank"] extensions.
 
 [TIP]
 ====
@@ -14,7 +14,7 @@ which allows you to run this entire tutorial within a container that will have a
 
 == CLI Tools
 
-The following CLI tools are required for running the exercises in this tutorial.
+The following CLI tools are recommended for running the exercises in this tutorial.
 
 ////
 ifndef::workshop[]
@@ -27,7 +27,7 @@ endif::workshop[]
 GraalVM is only required if you intend to build a native image for your local operating system. If you want to create a container using a native image, you can use the Quarkus feature for this and don't need to install GraalVM locally.
 ====
 
-NOTE: You can also use Docker instead of Podman. The advantage of Podman is that it is 100% Free Open Source and does not need to run with elevated privileges. Just use 'podman' instead of 'docker' throughout the tutorial's instructions, or easier yet, alias docker=podman to automatically use podman under the hood for docker commands.
+NOTE: * You can also use Docker instead of Podman. The advantage of Podman is that it is 100% Free Open Source and does not need to run with elevated privileges. Just use 'podman' instead of 'docker' throughout the tutorial's instructions, or easier yet, alias docker=podman to automatically use podman under the hood for docker commands.
 
 [tabs]
 ====
@@ -36,11 +36,12 @@ Local  Installation::
 --
 Please have them installed and configured before you get started with any of the tutorial chapters.
 
+
 [options="header"]
 |===
 |**Tool**|**macOS**|**Fedora**|**Windows**
 
-| **Podman Desktop**
+| **Podman Desktop* **
 | https://podman-desktop.io/downloads[Podman Desktop for Mac, window="_blank"]
 | https://podman-desktop.io/downloads[Podman Desktop for Linux, window="_blank"]
 | https://podman-desktop.io/downloads[Podman Desktop for Windows, window="_blank"]
@@ -61,6 +62,21 @@ Please have them installed and configured before you get started with any of the
 | https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-{graalvm-version}/graalvm-ce-java17-windows-amd64-{graalvm-version}.zip[GraalVM Community Edition {graalvm-version}]
 
 |===
+
+[TIP]
+=====
+You can also install Java and Maven using https://sdkman.io[SDKMAN!]. This allows easy version/distribution switching (and you can install the Quarkus CLI with it as well)
+[.console-input]
+[source,bash,subs="+macros,+attributes"]
+----
+  curl -s "https://get.sdkman.io" | bash
+  source "$HOME/.sdkman/bin/sdkman-init.sh"
+
+  sdk install java 
+  sdk install maven
+  sdk install quarkus
+----
+=====
 --
 Container Image::
 +
@@ -77,12 +93,25 @@ mkdir work
 docker run -ti -p 8080:8080 -v `pwd`/work:/work \
   -v `mvn help:evaluate -Dexpression=settings.localRepository | grep \
   -v '\[INFO\]' | grep -v '\[WARNING\]'`:/opt/developer/.m2/repository \
-  --rm quay.io/rhdevelopers/tutorial-tools bash
+  --rm quay.io/rhdevelopers/tutorial-tools:0.0.7 bash
 
 # -p will map Quarkus running in the container to your host port
 # -v `pwd`... will map the host work subdirectory to the container /work directory, this is where you will create your application
 # -v `mvn ...` will map your ~/.m2/repository of your host to the container repository to save downloading again between image runs
 -----
+
+[TIP]
+=====
+Installing https://sdkman.io[SDKMAN!] in the container will allow you to install the Quarkus CLI very easily:
+[.console-input]
+[source,bash,subs="+macros,+attributes"]
+----
+  curl -s "https://get.sdkman.io" | bash
+  source "$HOME/.sdkman/bin/sdkman-init.sh"
+
+  sdk install quarkus
+----
+=====
 --
 ====