Explorar o código

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.
Jesse Vander Does %!s(int64=6) %!d(string=hai) anos
pai
achega
feb2768b61
Modificáronse 2 ficheiros con 8 adicións e 7 borrados
  1. 1 1
      .dockerignore
  2. 7 6
      Dockerfile

+ 1 - 1
.dockerignore

@@ -1,3 +1,3 @@
 .dockerignore
 .dockerignore
 Dockerfile
 Dockerfile
-
+sdk

+ 7 - 6
Dockerfile

@@ -10,16 +10,17 @@ RUN apt-get update && \
     pip install conan && \
     pip install conan && \
     conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-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
 COPY . /fbx2gltf
 
 
 WORKDIR /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
 # 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 && \
 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 . && \
     conan build -bf docker-build . && \