#3: Dockerfile moved to deploy dir. Newer version of Felix used.

ReliSA · Dec 18, 2018 · fb83cf6 · fb83cf6
1 parent 1885188
commit fb83cf6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Dockerfile → deploy/Dockerfile b/Dockerfile → deploy/Dockerfile
@@ -7,12 +7,12 @@ WORKDIR /felix
 
 # Download and upack Felix
 # 4.6.1 is compatible with Java 1.7
-ADD https://archive.apache.org/dist/felix/org.apache.felix.main.distribution-4.6.1.tar.gz ./apache-felix.tar.gz
+ADD https://archive.apache.org/dist/felix/org.apache.felix.main.distribution-5.0.0.tar.gz ./apache-felix.tar.gz
 RUN tar xvfz apache-felix.tar.gz && rm apache-felix.tar.gz
-ENV FELIX_PATH /felix/felix-framework-4.6.1
+ENV FELIX_PATH /felix/felix-framework-5.0.0
 
 # Add CRCE modules to Felix autodeploy dir
-ADD ./deploy/runner/bundles/* ${FELIX_PATH}/bundle/
+ADD ./runner/bundles/* ${FELIX_PATH}/bundle/
 
 # Run Felix
-CMD cd ${FELIX_PATH} && java -jar ./bin/felix.jar
+CMD cd ${FELIX_PATH} && java -Dgosh.args=--noi -jar ./bin/felix.jar