diff options
| author | Tianon Gravi <admwiggin@gmail.com> | 2015-09-01 11:26:15 -0700 |
|---|---|---|
| committer | David Calavera <david.calavera@gmail.com> | 2015-09-10 14:43:43 -0400 |
| commit | 57e9c4f7e56f6d022f015883102fe4d100328a52 (patch) | |
| tree | 108f8d3d9967de7275a11cd7da1816b29a9ee6c8 | |
| parent | 3e8da3601764186604e12baf01a9762a35388f1c (diff) | |
| download | docker-57e9c4f7e56f6d022f015883102fe4d100328a52.tar.gz | |
Swap "ubuntu-debootstrap" for just "ubuntu"
See https://github.com/docker-library/official-images/pull/982#issuecomment-133207587.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
| -rw-r--r-- | contrib/builder/deb/ubuntu-precise/Dockerfile (renamed from contrib/builder/deb/ubuntu-debootstrap-precise/Dockerfile) | 2 | ||||
| -rw-r--r-- | contrib/builder/deb/ubuntu-trusty/Dockerfile (renamed from contrib/builder/deb/ubuntu-debootstrap-wily/Dockerfile) | 2 | ||||
| -rw-r--r-- | contrib/builder/deb/ubuntu-vivid/Dockerfile (renamed from contrib/builder/deb/ubuntu-debootstrap-vivid/Dockerfile) | 2 | ||||
| -rw-r--r-- | contrib/builder/deb/ubuntu-wily/Dockerfile (renamed from contrib/builder/deb/ubuntu-debootstrap-trusty/Dockerfile) | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/contrib/builder/deb/ubuntu-debootstrap-precise/Dockerfile b/contrib/builder/deb/ubuntu-precise/Dockerfile index ae6f464783..50b4a12e16 100644 --- a/contrib/builder/deb/ubuntu-debootstrap-precise/Dockerfile +++ b/contrib/builder/deb/ubuntu-precise/Dockerfile @@ -2,7 +2,7 @@ # THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/generate.sh"! # -FROM ubuntu-debootstrap:precise +FROM ubuntu:precise RUN apt-get update && apt-get install -y bash-completion build-essential curl ca-certificates debhelper git libapparmor-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* diff --git a/contrib/builder/deb/ubuntu-debootstrap-wily/Dockerfile b/contrib/builder/deb/ubuntu-trusty/Dockerfile index a40729e634..aca7eecd8e 100644 --- a/contrib/builder/deb/ubuntu-debootstrap-wily/Dockerfile +++ b/contrib/builder/deb/ubuntu-trusty/Dockerfile @@ -2,7 +2,7 @@ # THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/generate.sh"! # -FROM ubuntu-debootstrap:wily +FROM ubuntu:trusty RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* diff --git a/contrib/builder/deb/ubuntu-debootstrap-vivid/Dockerfile b/contrib/builder/deb/ubuntu-vivid/Dockerfile index a8e238590a..ee26402743 100644 --- a/contrib/builder/deb/ubuntu-debootstrap-vivid/Dockerfile +++ b/contrib/builder/deb/ubuntu-vivid/Dockerfile @@ -2,7 +2,7 @@ # THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/generate.sh"! # -FROM ubuntu-debootstrap:vivid +FROM ubuntu:vivid RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* diff --git a/contrib/builder/deb/ubuntu-debootstrap-trusty/Dockerfile b/contrib/builder/deb/ubuntu-wily/Dockerfile index 599a74f890..3f79c56e49 100644 --- a/contrib/builder/deb/ubuntu-debootstrap-trusty/Dockerfile +++ b/contrib/builder/deb/ubuntu-wily/Dockerfile @@ -2,7 +2,7 @@ # THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/generate.sh"! # -FROM ubuntu-debootstrap:trusty +FROM ubuntu:wily RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |