diff --git a/docs/intro.adoc b/docs/intro.adoc index 9e4c888..af12369 100644 --- a/docs/intro.adoc +++ b/docs/intro.adoc @@ -33,7 +33,7 @@ To get started, {{ CHE_URL }}[access the Che instance,window=_blank] and log in image::che-login.png[login,400] -Once you log in, you'll be placed on your personal dashboard. We've pre-created workspaces for you to use. Click on the name of the pre-created workspace on the left, as shown below (the name will be different depending on your assigned number): +Once you log in, you'll be placed on your personal dashboard. We've pre-created workspaces for you to use. Click on the name of the pre-created workspace on the left, as shown below (the name will be different depending on your assigned number). You can also click on the name of the workspace in the center, and then click on the green button that says "OPEN" on the top right hand side of the screen: image::che-precreated.png[precreated,800] diff --git a/setup/preparelab.sh b/setup/preparelab.sh index 8812e3d..ed065ca 100755 --- a/setup/preparelab.sh +++ b/setup/preparelab.sh @@ -253,8 +253,8 @@ SSO_TOKEN=$(curl -s -d "username=${KEYCLOAK_USER}&password=${KEYCLOAK_PASSWORD}& jq -r '.access_token') # Import realm -curl -v -H "Authorization: Bearer ${SSO_TOKEN}" -H "Content-Type:application/json" -d ../files/quarkus-realm.json \ - -X POST http://keycloak-che.${HOSTNAME_SUFFIX}/auth/admin/realms +curl -v -H "Authorization: Bearer ${SSO_TOKEN}" -H "Content-Type:application/json" -d @../files/quarkus-realm.json \ + -X POST "http://keycloak-che.${HOSTNAME_SUFFIX}/auth/admin/realms" # Create Che users, let them view che namespace for i in {1..$USERCOUNT} ; do @@ -262,7 +262,7 @@ for i in {1..$USERCOUNT} ; do USERNAME=user${i} FIRSTNAME=User${i} LASTNAME=Developer - curl -v -H "Authorization: Bearer ${SSO_TOKEN}" -H "Content-Type:application/json" -d '{"username":"user'${i}'","enabled":true,"emailVerified": true,"firstName": "User'${i}'","lastName": "Developer","email": "user'${i}'@no-reply.com", "credentials":[{"type":"password","value":"pass'${i}'","temporary":false}]}' -X POST http://keycloak-che.${HOSTNAME_SUFFIX}/auth/admin/realms/codeready/users + curl -v -H "Authorization: Bearer ${SSO_TOKEN}" -H "Content-Type:application/json" -d '{"username":"user'${i}'","enabled":true,"emailVerified": true,"firstName": "User'${i}'","lastName": "Developer","email": "user'${i}'@no-reply.com", "credentials":[{"type":"password","value":"pass'${i}'","temporary":false}]}' -X POST "http://keycloak-che.${HOSTNAME_SUFFIX}/auth/admin/realms/codeready/users" done # Import stack definition diff --git a/setup/stack.Dockerfile b/setup/stack.Dockerfile index ed7ae58..587fd34 100644 --- a/setup/stack.Dockerfile +++ b/setup/stack.Dockerfile @@ -21,8 +21,8 @@ USER jboss ENV MAVEN_OPTS="-Xmx4G -Xss128M -XX:MetaspaceSize=1G -XX:MaxMetaspaceSize=2G -XX:+CMSClassUnloadingEnabled" ENV PATH="/usr/local/maven/apache-maven-3.6.0/bin:${PATH}" -RUN cd /tmp && mkdir project && cd project && mvn io.quarkus:quarkus-maven-plugin:0.18.0:create -DprojectGroupId=org.acme -DprojectArtifactId=footest -Dextensions="quarkus-agroal,quarkus-arc,quarkus-hibernate-orm,quarkus-hibernate-orm-panache,quarkus-jdbc-h2,quarkus-jdbc-postgresql,quarkus-kubernetes,quarkus-scheduler,quarkus-smallrye-fault-tolerance,quarkus-smallrye-health,quarkus-smallrye-opentracing" && mvn clean compile package && mvn clean && cd / && rm -rf /tmp/project -RUN cd /tmp && mkdir project && cd project && mvn io.quarkus:quarkus-maven-plugin:0.18.0:create -DprojectGroupId=org.acme -DprojectArtifactId=footest -Dextensions="quarkus-smallrye-reactive-streams-operators,quarkus-smallrye-reactive-messaging,quarkus-smallrye-reactive-messaging-kafka,quarkus-swagger-ui,quarkus-vertx,quarkus-kafka-client, quarkus-smallrye-metrics,quarkus-smallrye-openapi" && mvn clean compile package && mvn clean compile package -Pnative && mvn clean && cd / && rm -rf /tmp/project +RUN cd /tmp && mkdir project && cd project && mvn io.quarkus:quarkus-maven-plugin:0.19.1:create -DprojectGroupId=org.acme -DprojectArtifactId=footest -Dextensions="quarkus-agroal,quarkus-arc,quarkus-hibernate-orm,quarkus-hibernate-orm-panache,quarkus-jdbc-h2,quarkus-jdbc-postgresql,quarkus-kubernetes,quarkus-scheduler,quarkus-smallrye-fault-tolerance,quarkus-smallrye-health,quarkus-smallrye-opentracing" && mvn clean compile package && mvn clean && cd / && rm -rf /tmp/project +RUN cd /tmp && mkdir project && cd project && mvn io.quarkus:quarkus-maven-plugin:0.19.1:create -DprojectGroupId=org.acme -DprojectArtifactId=footest -Dextensions="quarkus-smallrye-reactive-streams-operators,quarkus-smallrye-reactive-messaging,quarkus-smallrye-reactive-messaging-kafka,quarkus-swagger-ui,quarkus-vertx,quarkus-kafka-client, quarkus-smallrye-metrics,quarkus-smallrye-openapi" && mvn clean compile package && mvn clean compile package -Pnative && mvn clean && cd / && rm -rf /tmp/project RUN siege && sed -i 's/^connection = close/connection = keep-alive/' $HOME/.siege/siege.conf && sed -i 's/^benchmark = false/benchmark = true/' $HOME/.siege/siege.conf