Merge pull request #9 from bimspot/feature/ifc-open-shell-python

Added node 12, python3.6. Moved ifcopenshell python library into xeokit-converter image. Updated xeokit-gltf-to-xkt version.

Dockerfile

@@ -9,29 +9,34 @@ FROM bimspot/ifcopenshell:bionic-0.6.0 as IfcConvert
 FROM mcr.microsoft.com/dotnet/core/runtime:3.1-bionic as xeokit-converter
 
 RUN apt-get -qq update && apt-get -qq install -y  \
-  nodejs \
   wget \
-  npm \
   unzip \
-  git
+  git \
+  python3.6 \
+  curl \
+  && curl -sL https://deb.nodesource.com/setup_12.x | bash - \
+  && apt-get install nodejs -y \
+  && apt autoremove -qq  -y \
+  && rm -r /var/lib/apt/lists/*
 
-RUN npm install npm@latest -g
-RUN npm install xeokit/xeokit-gltf-to-xkt#33d3d4b84f8fffcdb457d74b4e98d01269fcd377 -g
+RUN npm install npm@latest -g \
+  && npm install xeokit/xeokit-gltf-to-xkt#35c3378849efca927af948ba0c2a293ca17c2da8 -g
 
 # Converting tools
 COPY --from=IfcConvert /usr/bin/IfcConvert /usr/bin/IfcConvert
 RUN ln -s /usr/lib/IfcConvert /usr/local/bin/IfcConvert
+COPY --from=IfcConvert /usr/local/lib/python3.6/dist-packages/ifcopenshell /usr/local/lib/python3.6/dist-packages/ifcopenshell
 
 # Install COLLADA2GLTF
-RUN wget --quiet https://github.com/KhronosGroup/COLLADA2GLTF/releases/download/v2.1.5/COLLADA2GLTF-v2.1.5-linux.zip
-RUN unzip -q COLLADA2GLTF-v2.1.5-linux.zip -d /usr/lib/COLLADA2GLTF
-RUN ln -s /usr/lib/COLLADA2GLTF/COLLADA2GLTF-bin /usr/local/bin/COLLADA2GLTF
-RUN rm -rf COLLADA2GLTF-v2.1.5-linux.zip
+RUN wget --quiet https://github.com/KhronosGroup/COLLADA2GLTF/releases/download/v2.1.5/COLLADA2GLTF-v2.1.5-linux.zip \
+  && unzip -q COLLADA2GLTF-v2.1.5-linux.zip -d /usr/lib/COLLADA2GLTF \
+  && ln -s /usr/lib/COLLADA2GLTF/COLLADA2GLTF-bin /usr/local/bin/COLLADA2GLTF \
+  && rm -rf COLLADA2GLTF-v2.1.5-linux.zip
 
 # IFC metadata
-RUN wget --quiet https://github.com/bimspot/xeokit-metadata/releases/download/1.0.0/xeokit-metadata-linux-x64.tar.gz
-RUN tar -zxvf xeokit-metadata-linux-x64.tar.gz
-RUN chmod +x xeokit-metadata-linux-x64/xeokit-metadata
-RUN cp -r xeokit-metadata-linux-x64/ /usr/lib/xeokit-metadata
-RUN ln -s /usr/lib/xeokit-metadata/xeokit-metadata /usr/local/bin/xeokit-metadata
-RUN rm -rf xeokit-metadata-linux-x64.tar.gz
+RUN wget --quiet https://github.com/bimspot/xeokit-metadata/releases/download/1.0.0/xeokit-metadata-linux-x64.tar.gz \
+  && tar -zxvf xeokit-metadata-linux-x64.tar.gz \
+  && chmod +x xeokit-metadata-linux-x64/xeokit-metadata \
+  && cp -r xeokit-metadata-linux-x64/ /usr/lib/xeokit-metadata \
+  && ln -s /usr/lib/xeokit-metadata/xeokit-metadata /usr/local/bin/xeokit-metadata \
+  && rm -rf xeokit-metadata-linux-x64.tar.gz