Merge pull request #31 from life-research/hotfix/0.6.2

Hotfix/0.6.2

Dockerfile

@@ -7,8 +7,8 @@ RUN lein uberjar
 
 FROM openjdk:8u222-jre
 
-COPY --from=build /build/target/blaze-0.6.1-standalone.jar /app/
+COPY --from=build /build/target/blaze-0.6.2-standalone.jar /app/
 
 WORKDIR /app
 
-CMD ["/bin/bash", "-c", "java $JVM_OPTS -jar blaze-0.6.1-standalone.jar"]
+CMD ["/bin/bash", "-c", "java $JVM_OPTS -jar blaze-0.6.2-standalone.jar"]

README.md

@@ -14,7 +14,7 @@ The goal of this project is to provide a FHIR® Store with an internal CQL Evalu
 
 The project is currently under active development. Essentially all official [CQL Tests][3] pass. Please report any issues you encounter during evaluation.
 
-Latest release: [v0.6.1][5]
+Latest release: [v0.6.2-beta.1][5]
 
 ## Quick Start
 
@@ -23,14 +23,14 @@ In order to run Blaze with an in-memory, volatile database, just execute the fol
 ### Docker
 
 ```bash
-docker run -p 8080:8080 liferesearch/blaze:0.6.1
+docker run -p 8080:8080 liferesearch/blaze:0.6.2
 ```
 
 ### Java
 
 ```bash
-wget https://github.com/life-research/blaze/releases/download/v0.6.1/blaze-0.6.1-standalone.jar
-java -jar blaze-0.6.1-standalone.jar
+wget https://github.com/life-research/blaze/releases/download/v0.6.2-beta.1/blaze-0.6.2-standalone.jar
+java -jar blaze-0.6.2-standalone.jar
 ```
 
 Logging output should appear which prints the most important settings and system parameters like Java version and available memory.
@@ -56,4 +56,4 @@ your option) any later version.
 [2]: <http://cql-runner.dataphoria.org/>
 [3]: <https://cql.hl7.org/tests.html>
 [4]: <https://alexanderkiel.gitbook.io/blaze/deployment>
-[5]: <https://github.com/life-research/blaze/releases/tag/v0.6.1>
+[5]: <https://github.com/life-research/blaze/releases/tag/v0.6.2-beta.1>

docker-compose.yml

@@ -11,7 +11,7 @@ services:
     volumes:
     - "db-data:/data"
   store:
-    image: "liferesearch/blaze:0.6.1"
+    image: "liferesearch/blaze:0.6.2"
     environment:
       BASE_URL: "http://localhost:8080"
       DATABASE_URI: "datomic:free://db:4334/dev?password=datomic"

docs/index.adoc

@@ -69,15 +69,15 @@ You can change the data dir in the properties file if you like to have it at a d
 ==== Install Blaze
 
 Blaze runs on the JVM and comes as single JAR file.
-Download the most recent version https://github.com/life-research/blaze/releases/tag/v0.6.1[here].
-Look for `blaze-0.6.1-standalone.jar`.
+Download the most recent version https://github.com/life-research/blaze/releases/tag/v0.6.2-beta.1[here].
+Look for `blaze-0.6.2-standalone.jar`.
 In addition to the JAR file, Blaze needs a set of FHIR® structure definitions to build it's database schema.
 Please download and unpack the `fhir.zip` from the same location.
 
 After the download, you can start blaze with the following command (Linux, MacOS):
 
 ```
-DATABASE_URI=datomic:free://localhost:4334/db java -server -Xms2g -Xmx2g -XX:+UseG1GC -jar blaze-0.6.1-standalone.jar
+DATABASE_URI=datomic:free://localhost:4334/db java -server -Xms2g -Xmx2g -XX:+UseG1GC -jar blaze-0.6.2-standalone.jar
 ```
 
 Under Windows you need to set the Environment variables in the PowerShell before starting Blaze:

project.clj

@@ -1,4 +1,4 @@
-(defproject blaze "0.6.1"
+(defproject blaze "0.6.2"
   :description "A FHIR Store with internal, fast CQL Evaluation Engine"
   :url "https://github.com/life-research/blaze"
 

src/blaze/system.clj

@@ -90,7 +90,7 @@
 
 ;; ---- Functions -------------------------------------------------------------
 
-(def ^:private version "0.6.1")
+(def ^:private version "0.6.2")
 
 (def ^:private base-url "http://localhost:8080")
 

src/blaze/terminology_service/extern.clj

@@ -66,8 +66,14 @@
                    client-middleware/wrap-url
                    client-middleware/wrap-query-params
                    client')))))}
+
+      ;; It's important to disable DNS resolving when in proxy mode, because
+      ;; first it's not necessary and second domain names which are resolvable
+      ;; by the proxy might not resolvable locally. Can be removed when
+      ;; https://github.com/ztellman/aleph/issues/522 is solved.
       (seq proxy-options)
-      (assoc-in [:connection-options :proxy-options] proxy-options))))
+      (update :connection-options assoc :proxy-options
+              proxy-options :name-resolver :noop))))
 
 
 (defn- expand-value-set [base opts params]