File tree Expand file tree Collapse file tree 1 file changed +1
-7
lines changed Expand file tree Collapse file tree 1 file changed +1
-7
lines changed Original file line number Diff line number Diff line change @@ -73,15 +73,9 @@ ENV PYTHONDONTWRITEBYTECODE=1 PYTHONUNBUFFERED=1 PYTHONIOENCODING=UTF-8 LANG=C.U
73
73
74
74
ARG framework_support_installable=sagemaker_tensorflow_container-2.0.0.tar.gz
75
75
COPY $framework_support_installable .
76
- <<<<<<< HEAD
77
76
ARG TF_URL="https://tensorflow-aws.s3-us-west-2.amazonaws.com/1.13/AmazonLinux/cpu/latest-patch-latest-patch/tensorflow-1.13.1-cp36-cp36m-linux_x86_64.whl"
78
77
79
78
RUN ${PIP} --no-cache-dir install --upgrade pip setuptools
80
- =======
81
- ARG TF_URL="https://s3-us-west-2.amazonaws.com/tensorflow-aws/1.13/AmazonLinux/cpu/latest-patch-s3_testcopy.patch/tensorflow-1.13.1-cp36-cp36m-linux_x86_64.whl"
82
-
83
- RUN ${PIP} --no-cache-dir install --upgrade pip setuptools
84
- >>>>>>> Merge dockerfiles
85
79
86
80
# Some TF tools expect a "python" binary
87
81
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
@@ -113,4 +107,4 @@ RUN ${PIP} install --no-cache-dir -U \
113
107
114
108
ENV SAGEMAKER_TRAINING_MODULE sagemaker_tensorflow_container.training:main
115
109
116
- CMD ["bin/bash"]
110
+ CMD ["bin/bash"]
You can’t perform that action at this time.
0 commit comments