removing reference to custom genie build since latest version of the genie RC refers to a version of Spring which points to an official version of Hibernate with the CRDB dialect. also removing unnecessary test containers as it appears the hadoop containers don't start anyway.

Author: timveil

example-netflix-genie/README.md

@@ -5,24 +5,10 @@ Single node CockroachDB cluster with Netflix Genie https://github.com/Netflix/ge
 * `crdb` - CockroachDB node
 * `crdb-init` - ephemeral CockroachDB node used to create database
 * `genie` - Genie app instance
-* `genie-apache` - Genie Demo Apache
-* `genie-client` - Genie Demo Client
-* `genie-hadoop-prod` - Simple Hadoop instance
-* `genie-hadoop-test` - Simple Hadoop test instance
-* `genie-presto` - Presto instance
 
 ## Testing
-I forked Genie [here](https://github.com/timveil-cockroach/genie) and updated a handful of `gradle` files to pull the custom Hibernate jar (`hibernate-core-5.5.0-SNAPSHOT.jar`) containing the new `org.hibernate.dialect.CockroachDB201Dialect`.  To simplfy testing, I published the custom Hibernate jar to publically assessible custom Maven repository... https://mymavenrepo.com/repo/RxBukD1nCtgtoR5src2I/.  Before testing, I ran the following commands to build Genie and create local updated Docker images with the new dependencies.
-
-```
-./gradlew clean build -x check
-./gradlew clean dockerBuildAllImages -x check
-```
-
-Once the new docker images are ready, run the following.
-
 1) run `./up.sh`
-3) from a local shell run the following to test...
+2) from a local shell run the following to test...
 ```
 curl 'http://localhost:8080/api/v3/applications' -i -X POST -H 'Content-Type: application/json; charset=UTF-8' -d '{
   "id" : null,
@@ -42,16 +28,6 @@ curl 'http://localhost:8080/api/v3/applications' -i -X POST -H 'Content-Type: ap
 }'
 ```
 
-An alternate method to test the Genie server would be to simply build Genie from the fork and run something like this (assuming CRDB is up)
-```
-java -jar genie-app/build/libs/genie-app-4.0.0-SNAPSHOT.jar \
-    --spring.jpa.hibernate.ddl-auto=create \
-    --spring.flyway.enabled=false \
-    --spring.datasource.url=jdbc:postgresql://127.0.0.1:26250/genie?sslmode=disable \
-    --spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.CockroachDB201Dialect \
-    --spring.datasource.platform=postgresql
-```
-
 ## Helpful Commands
 
 ### Open Interactive Shells
@@ -60,18 +36,5 @@ docker-compose exec crdb /bin/bash
 docker-compose exec genie /bin/bash
 ```
 
-## Publishing the custom CRDB Hibernate jar
-
-I downloaded the `hibernate-core-5.5.0-SNAPSHOT.jar` jar (provided by CRDB engineering) to my local `Downloads` folder and ran the below command to upload this jar to a private `mvn` repo that I created here `https://mymavenrepo.com/app/repos/euqQvvGJ8W8mugiThH33/`
-
-```
-mvn deploy:deploy-file -DgroupId=org.hibernate \
-  -DartifactId=hibernate-core \
-  -Dversion=5.5.0-SNAPSHOT \
-  -Dpackaging=jar \
-  -Dfile=hibernate-core-5.5.0-SNAPSHOT.jar \
-  -Durl=https://mymavenrepo.com/repo/bj1Jazo305dltxkS0McV/
-```
-
 
 

example-netflix-genie/docker-compose.yml

@@ -26,59 +26,7 @@ services:
     ports:
       - "8080:8080"
     depends_on:
-      - genie-hadoop-prod
-      - genie-hadoop-test
-      - genie-apache
-      - genie-presto
       - crdb
     tty: true
-    container_name: genie_demo_app
-    hostname: genie_demo_app
-
-  genie-apache:
-    image: netflixoss/genie-demo-apache:latest.snapshot
-    tty: true
-    container_name: genie_demo_apache
-    hostname: genie_demo_apache
-
-  genie-client:
-    image: netflixoss/genie-demo-client:latest.snapshot
-    depends_on:
-      - genie
-    tty: true
-    container_name: genie_demo_client
-    hostname: genie_demo_client
-
-  genie-hadoop-prod:
-    image: sequenceiq/hadoop-docker:2.7.1
-    command: /bin/bash -c "/usr/local/hadoop/sbin/mr-jobhistory-daemon.sh start historyserver && /etc/bootstrap.sh -bash"
-    ports:
-      - "19888:19888"
-      - "50070:50070"
-      - "50075:50075"
-      - "8088:8088"
-      - "8042:8042"
-    tty: true
-    container_name: genie_demo_hadoop_prod
-    hostname: genie_demo_hadoop_prod
-
-  genie-hadoop-test:
-    image: sequenceiq/hadoop-docker:2.7.1
-    command: /bin/bash -c "/usr/local/hadoop/sbin/mr-jobhistory-daemon.sh start historyserver && /etc/bootstrap.sh -bash"
-    ports:
-      - "19889:19888"
-      - "50071:50070"
-      - "50076:50075"
-      - "8089:8088"
-      - "8043:8042"
-    tty: true
-    container_name: genie_demo_hadoop_test
-    hostname: genie_demo_hadoop_test
-
-  genie-presto:
-    image: prestosql/presto:337
-    ports:
-      - "9090:8080"
-    tty: true
-    container_name: genie_demo_presto
-    hostname: genie_demo_presto
+    container_name: genie
+    hostname: genie

example-netflix-genie/genie/Dockerfile

@@ -1,4 +1,4 @@
-FROM netflixoss/genie-app:latest.snapshot
+FROM netflixoss/genie-app:latest.candidate
 
 LABEL maintainer="[email protected]"