diff --git a/Dockerfile b/Dockerfile
index bf227737c5a67b006ccc221235daf6d8ad7b3bd8..d10fad6370ac758d666e4d69953a88fec1877d81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,11 +34,12 @@ RUN apt-get update && \
     net-tools && \
     apt-get clean -y
 
-# Install Go
+# Install Go and glide
 RUN wget -O go.tgz https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz && \
     tar -C /usr/local -xzf go.tgz && \
     mkdir /root/gopath && \
-    rm go.tgz
+    rm go.tgz \
+    curl https://glide.sh/get | sh
 ENV GOROOT=/usr/local/go GOPATH=/root/gopath
 # should not be in the same line with GOROOT definition, otherwise docker build could not find GOROOT.
 ENV PATH=${PATH}:${GOROOT}/bin
@@ -57,7 +58,7 @@ RUN pip install --upgrade pip && \
     pip install -U docopt PyYAML sphinx && \
     pip install -U sphinx-rtd-theme==0.1.9 recommonmark && \
     pip install pre-commit 'requests==2.9.2' 'ipython==5.3.0' && \
-    pip install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \ 
+    pip install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
     pip install rarfile
 
 # To fix https://github.com/PaddlePaddle/Paddle/issues/1954, we use
diff --git a/cmake/generic.cmake b/cmake/generic.cmake
index 92e14f2581aab09d80ff956d5806544ff0634e81..ca358da8f1482422f2811365beb7dcade45bef02 100644
--- a/cmake/generic.cmake
+++ b/cmake/generic.cmake
@@ -302,7 +302,7 @@ function(go_binary TARGET_NAME)
     -o "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}"
     "./${CMAKE_CURRENT_SOURCE_REL_DIR}/${go_binary_SRCS}"
   WORKING_DIRECTORY "${PADDLE_IN_GOPATH}/go")
-  # add_custom_target(${TARGET_NAME} ALL DEPENDS go_vendor ${TARGET_NAME}_link ${TARGET_NAME}_timestamp ${go_binary_DEPS})
+  # TODO: don't know what ${TARGET_NAME}_link does
   add_custom_target(${TARGET_NAME} ALL DEPENDS go_vendor ${TARGET_NAME}_timestamp ${go_binary_DEPS})
   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME} DESTINATION bin)
 endfunction(go_binary)