Merge branch 'master' into rel_4_1_0

README.md

@@ -2,6 +2,8 @@
 
 This project is a complete starter project you can use to deploy a FHIR server using HAPI FHIR JPA.
 
+Note that this project is specifically intended for end users of the HAPI FHIR JPA server module (in other words, it helps you implement HAPI FHIR, it is not the source of the library itself). If you are looking for the main HAPI FHIR project, see here: https://github.com/jamesagnew/hapi-fhir
+
 # Prerequisites
 
 In order to use this sample, you should have:
@@ -39,6 +41,8 @@ To configure the starter app to use MySQL, instead of the default Derby, update
 * datasource.driver=com.mysql.jdbc.Driver
 * datasource.url=jdbc:mysql://localhost:3306/hapi_dstu3
 * hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+* datasource.username=admin
+* datasource.password=admin
 
 Because the integration tests within the project rely on the default Derby database configuration, it is important to either explicity skip the integration tests during the build process, i.e., `mvn install -DskipTests`, or delete the tests altogether. Failure to skip or delete the tests once you've configured MySQL for the datasource.driver, datasource.url, and hibernate.dialect as outlined above will result in build errors and compilation failure.
 
@@ -72,6 +76,24 @@ Again, browse to the following link to use the server (note that the port 8080 m
 
 [http://localhost:8080/hapi-fhir-jpaserver/](http://localhost:8080/hapi-fhir-jpaserver/)
 
+# Deploy with docker compose
+
+Docker compose is a simple option to build and deploy container. To deploy with docker compose, you should build the project
+with ```mvn clean install``` and then bring up the containers with ```docker-compose up -d --build```. The server can be 
+reached at http://localhost:8080/hapi-fhir-jpaserver/. 
+
+In order to use another port, change the `ports` parameter 
+inside ``docker-compose.yml`` to ```8888:8080```, where 8888 is a port of your choice.
+
+The docker compose set also includes my MySQL database, if you choose to use MySQL instead of derby,  change the following 
+properties in hapi.properties:
+
+* datasource.driver=com.mysql.jdbc.Driver
+* datasource.url=jdbc:mysql://hapi-fhir-mysql:3306/hapi
+* hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+* datasource.username=admin
+* datasource.password=admin
+
 # Running hapi-fhir-jpaserver-example in Tomcat from IntelliJ
 
 Install Tomcat.