From a46749b3b06ed6b4e3e58d134105d5fbfe9fcec4 Mon Sep 17 00:00:00 2001
From: yuyang18 <yuyang18@1ad973e4-5ce8-4261-8a94-b56d1f490c56>
Date: Tue, 30 Aug 2016 16:21:16 +0000
Subject: [PATCH] Fix ubuntu image prefix

ISSUE=4599563


git-svn-id: https://svn.baidu.com/idl/trunk/paddle@1435 1ad973e4-5ce8-4261-8a94-b56d1f490c56
---
 paddle/scripts/docker/cpu-demo/Dockerfile  | 2 +-
 paddle/scripts/docker/cpu-devel/Dockerfile | 2 +-
 paddle/scripts/docker/cpu/Dockerfile       | 2 +-
 paddle/scripts/docker/generate.sh          | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/paddle/scripts/docker/cpu-demo/Dockerfile b/paddle/scripts/docker/cpu-demo/Dockerfile
index e968d47a78..fa71494e4d 100644
--- a/paddle/scripts/docker/cpu-demo/Dockerfile
+++ b/paddle/scripts/docker/cpu-demo/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu/ubuntu:14.04
+FROM ubuntu:14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
 ENV WITH_GPU=OFF
diff --git a/paddle/scripts/docker/cpu-devel/Dockerfile b/paddle/scripts/docker/cpu-devel/Dockerfile
index 6fb23877ac..114f61f24f 100644
--- a/paddle/scripts/docker/cpu-devel/Dockerfile
+++ b/paddle/scripts/docker/cpu-devel/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu/ubuntu:14.04
+FROM ubuntu:14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
 ENV WITH_GPU=OFF
diff --git a/paddle/scripts/docker/cpu/Dockerfile b/paddle/scripts/docker/cpu/Dockerfile
index c93e64a209..738df37251 100644
--- a/paddle/scripts/docker/cpu/Dockerfile
+++ b/paddle/scripts/docker/cpu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu/ubuntu:14.04
+FROM ubuntu:14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
 ENV WITH_GPU=OFF
diff --git a/paddle/scripts/docker/generate.sh b/paddle/scripts/docker/generate.sh
index ad63d0de14..009c4a8a56 100644
--- a/paddle/scripts/docker/generate.sh
+++ b/paddle/scripts/docker/generate.sh
@@ -2,17 +2,17 @@
 set -e
 cd `dirname $0`
 m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=OFF -DPADDLE_WITH_DEMO=OFF \
-   -DPADDLE_BASE_IMAGE=ubuntu/ubuntu:14.04\
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04\
    Dockerfile.m4 > cpu/Dockerfile
 cp build.sh cpu/
 
 m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=OFF \
-   -DPADDLE_BASE_IMAGE=ubuntu/ubuntu:14.04\
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04\
    Dockerfile.m4 > cpu-devel/Dockerfile
 cp build.sh cpu-devel/
 
 m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=ON \
-   -DPADDLE_BASE_IMAGE=ubuntu/ubuntu:14.04\
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04\
    Dockerfile.m4 > cpu-demo/Dockerfile
 cp build.sh cpu-demo/
 
-- 
GitLab