Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit d41023d

Browse files
committed
Improve order of execution of install scripts.
Remove uneccesary environment variable. /usr/loca/lib already in ld.so.conf*
1 parent 1540a84 commit d41023d

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

ci/docker/Dockerfile.build.ubuntu_base_cpu

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ WORKDIR /work/deps
2525

2626
RUN apt-get update && apt-get -y install sudo
2727

28+
# Always last
2829
ARG USER_ID=0
2930
ARG GROUP_ID=0
3031
COPY install/ubuntu_adduser.sh /work/

ci/docker/Dockerfile.build.ubuntu_build_cuda

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,3 @@ RUN /work/ubuntu_adduser.sh
6262
COPY runtime_functions.sh /work/
6363

6464
WORKDIR /work/mxnet
65-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib

ci/docker/Dockerfile.build.ubuntu_cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ COPY install/ubuntu_docs.sh /work/
7070
COPY install/docs_requirements /work/
7171
RUN /work/ubuntu_docs.sh
7272

73+
# Always last
7374
ARG USER_ID=0
7475
ARG GROUP_ID=0
7576
COPY install/ubuntu_adduser.sh /work/
@@ -78,4 +79,3 @@ RUN /work/ubuntu_adduser.sh
7879
COPY runtime_functions.sh /work/
7980

8081
WORKDIR /work/mxnet
81-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib

ci/docker/Dockerfile.build.ubuntu_gpu

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ RUN /work/ubuntu_docs.sh
6969
COPY install/ubuntu_tutorials.sh /work/
7070
RUN /work/ubuntu_tutorials.sh
7171

72+
COPY install/ubuntu_cudnn.sh /work/
73+
RUN /work/ubuntu_cudnn.sh
74+
75+
# Always last
7276
ARG USER_ID=0
7377
ARG GROUP_ID=0
7478
COPY install/ubuntu_adduser.sh /work/
7579
RUN /work/ubuntu_adduser.sh
7680

77-
COPY install/ubuntu_cudnn.sh /work/
78-
RUN /work/ubuntu_cudnn.sh
79-
8081
COPY runtime_functions.sh /work/
8182

8283
WORKDIR /work/mxnet
83-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib

ci/docker/Dockerfile.build.ubuntu_nightly_gpu

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,3 @@ RUN /work/ubuntu_adduser.sh
8383
COPY runtime_functions.sh /work/
8484

8585
WORKDIR /work/mxnet
86-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib

0 commit comments

Comments
 (0)