From fb83cf6ca9ec6b68f9ec8be46a06810f58209535 Mon Sep 17 00:00:00 2001 From: Zdenek Vales Date: Tue, 18 Dec 2018 20:00:04 +0100 Subject: [PATCH] #3: Dockerfile moved to deploy dir. Newer version of Felix used. --- Dockerfile => deploy/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename Dockerfile => deploy/Dockerfile (63%) diff --git a/Dockerfile b/deploy/Dockerfile similarity index 63% rename from Dockerfile rename to deploy/Dockerfile index a80de102..9a6f2d49 100644 --- a/Dockerfile +++ b/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