From feb2768b619be58aca7e344d3891ff6d14526549 Mon Sep 17 00:00:00 2001 From: Jesse Vander Does Date: Wed, 8 May 2019 09:10:08 -0700 Subject: [PATCH] Added sdk to dockerignore I've added the sdk directory to the docker ignore. With the SDK ignored, we can install the SDK before adding the project source. This allows the docker image to preserve most of the layer caches when source code is changed. --- .dockerignore | 2 +- Dockerfile | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.dockerignore b/.dockerignore index 6f2580c..9ff5cde 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,3 @@ .dockerignore Dockerfile - +sdk diff --git a/Dockerfile b/Dockerfile index d45013f..67cb1a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,16 +10,17 @@ RUN apt-get update && \ pip install conan && \ conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan +# Install FBX SDK +RUN mkdir -p /fbx2gltf/sdk/Linux/2019.2 && \ + curl -L https://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20192/fbx20192_fbxsdk_linux.tar.gz -o fbx20192_fbxsdk_linux.tar.gz && \ + tar -xvf fbx20192_fbxsdk_linux.tar.gz && \ + echo "yes\nn" | ./fbx20192_fbxsdk_linux /fbx2gltf/sdk/Linux/2019.2 && \ + rm -rf /fbxsdktemp + COPY . /fbx2gltf WORKDIR /fbx2gltf -# Install FBX SDK -RUN curl -L https://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20192/fbx20192_fbxsdk_linux.tar.gz -o fbx20192_fbxsdk_linux.tar.gz && \ - tar -xvf fbx20192_fbxsdk_linux.tar.gz && \ - echo "yes\nn" | ./fbx20192_fbxsdk_linux /fbx2gltf/sdk/Linux/2019.2 && \ - rm -rf /fbxsdktemp - # Build and install RUN conan install . -i docker-build -s build_type=Release -s compiler=gcc -s compiler.version=5 -s compiler.libcxx=libstdc++11 && \ conan build -bf docker-build . && \