Merge dockerfiles

Author: icywang86rui

docker/1.13.1/Dockerfile.cpu

@@ -73,9 +73,15 @@ ENV PYTHONDONTWRITEBYTECODE=1 PYTHONUNBUFFERED=1 PYTHONIOENCODING=UTF-8 LANG=C.U
 
 ARG framework_support_installable=sagemaker_tensorflow_container-2.0.0.tar.gz
 COPY $framework_support_installable .
+<<<<<<< HEAD
 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"
 
 RUN ${PIP} --no-cache-dir install --upgrade pip setuptools
+=======
+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"
+
+RUN ${PIP} --no-cache-dir install  --upgrade pip setuptools
+>>>>>>> Merge dockerfiles
 
 # Some TF tools expect a "python" binary
 RUN ln -s $(which ${PYTHON}) /usr/local/bin/python

scripts/build_all.py

@@ -58,13 +58,13 @@ def _parse_args():
 subprocess.check_call(login_cmd.split())
 
 for arch in ['cpu', 'gpu']:
-    for py_version in ['2', '3']:
+    for py_version in ['3']:
 
         binary_url = binaries['py{}-{}'.format(py_version, arch)]
         binary_file = os.path.basename(binary_url)
         cmd = 'wget -O {}/{} {}'.format(build_dir, binary_file, binary_url)
         print('Downloading binary file: {}'.format(cmd))
-        subprocess.check_call(cmd.split())
+        # subprocess.check_call(cmd.split())
 
         tag = '{}-{}-py{}'.format(args.version, arch, py_version)
         prev_image_uri = '{}.dkr.ecr.{}.amazonaws.com/{}:{}'.format(args.account, args.region, args.repo, tag)

scripts/publish_all.py

@@ -36,7 +36,7 @@ def _parse_args():
 args = _parse_args()
 
 for arch in ['cpu', 'gpu']:
-    for py_version in ['2', '3']:
+    for py_version in ['3']:
         source = '{}:{}-{}-py{}'.format(args.repo, args.version, arch, py_version)
         dest = '{}.dkr.ecr.{}.amazonaws.com/{}'.format(args.account, args.region, source)
         tag_cmd = 'docker tag {} {}'.format(source, dest)