From 92fc64b968afd5a21d59cc7a51caf38e1178e4a2 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Tue, 1 Oct 2019 02:50:10 +0200
Subject: [PATCH] Fix MXNet 1.5.1
---
ubuntu18.04/cuda-devel/Dockerfile | 8 ++++----
ubuntu18.04/devel/Dockerfile | 8 ++++----
windows1809/base/Dockerfile | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ubuntu18.04/cuda-devel/Dockerfile b/ubuntu18.04/cuda-devel/Dockerfile
index 9d69c5b..6da21ec 100644
--- a/ubuntu18.04/cuda-devel/Dockerfile
+++ b/ubuntu18.04/cuda-devel/Dockerfile
@@ -4,10 +4,10 @@ FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-ubuntu18.04
RUN apt-get update && \
apt-get install -y libopencv-dev && \
cd /opt && \
- curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/1.5.1.rc0/apache-mxnet-src-1.5.1.rc0-incubating.tar.gz && \
- tar -xf apache-mxnet-src-1.5.1.rc0-incubating.tar.gz --owner root --group root --no-same-owner && \
- rm -f apache-mxnet-src-1.5.1.rc0-incubating.tar.gz && \
- mv apache-mxnet-src-1.5.1.rc0-incubating mxnet-1.5.1 && \
+ curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/1.5.1/apache-mxnet-src-1.5.1-incubating.tar.gz && \
+ tar -xf apache-mxnet-src-1.5.1-incubating.tar.gz --owner root --group root --no-same-owner && \
+ rm -f apache-mxnet-src-1.5.1-incubating.tar.gz && \
+ mv apache-mxnet-src-1.5.1-incubating mxnet-1.5.1 && \
cd mxnet-1.5.1 && \
cmake -Bbuild -H. \
-DCMAKE_CXX_STANDARD=14 -DUSE_CXX14_IF_AVAILABLE=ON \
diff --git a/ubuntu18.04/devel/Dockerfile b/ubuntu18.04/devel/Dockerfile
index de0547f..eb742f2 100644
--- a/ubuntu18.04/devel/Dockerfile
+++ b/ubuntu18.04/devel/Dockerfile
@@ -3,10 +3,10 @@ FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-ubuntu18.04
RUN apt-get update && \
apt-get install -y libopencv-dev && \
cd /opt && \
- curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/1.5.1.rc0/apache-mxnet-src-1.5.1.rc0-incubating.tar.gz && \
- tar -xf apache-mxnet-src-1.5.1.rc0-incubating.tar.gz --owner root --group root --no-same-owner && \
- rm -f apache-mxnet-src-1.5.1.rc0-incubating.tar.gz && \
- mv apache-mxnet-src-1.5.1.rc0-incubating mxnet-1.5.1 && \
+ curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/1.5.1/apache-mxnet-src-1.5.1-incubating.tar.gz && \
+ tar -xf apache-mxnet-src-1.5.1-incubating.tar.gz --owner root --group root --no-same-owner && \
+ rm -f apache-mxnet-src-1.5.1-incubating.tar.gz && \
+ mv apache-mxnet-src-1.5.1-incubating mxnet-1.5.1 && \
cd mxnet-1.5.1 && \
cmake -Bbuild -H. \
-DCMAKE_CXX_STANDARD=14 -DUSE_CXX14_IF_AVAILABLE=ON \
diff --git a/windows1809/base/Dockerfile b/windows1809/base/Dockerfile
index a4f0e6d..74b3705 100644
--- a/windows1809/base/Dockerfile
+++ b/windows1809/base/Dockerfile
@@ -37,6 +37,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
RUN $vcpkg_dir = 'C:/vcpkg'; \
git clone https://git.imp.fu-berlin.de/bioroboticslab/robofish/vcpkg.git $vcpkg_dir; \
cd $vcpkg_dir; \
- git checkout 8b38945420d8c3031c2ccade982ba6422835cb70; \
+ git checkout 65fafc0b462d36388bf379a35a65af03d55c37be; \
./scripts/bootstrap.ps1; \
[Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine);
--
GitLab