From b8a0249999ac3ea5dd98f45b12a8e3e5b8709da1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 14 May 2015 11:40:18 -0600 Subject: [PATCH] Run update.sh --- ubuntu/README.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/ubuntu/README.md b/ubuntu/README.md index 24f1ba52d..7b1acefe5 100644 --- a/ubuntu/README.md +++ b/ubuntu/README.md @@ -7,9 +7,21 @@ For more information about this image and its history, please see the [relevant manifest file (`library/ubuntu`)](https://github.com/docker-library/official-images/blob/master/library/ubuntu) in the [`docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images). -# Ubuntu +# What is Ubuntu? -## sources.list +Ubuntu is a Debian-based Linux operating system, with Unity as its default desktop environment. It is based on free software and named after the Southern African philosophy of ubuntu (literally, "human-ness"), which often is translated as "humanity towards others" or "the belief in a universal bond of sharing that connects all humanity". + +Development of Ubuntu is led by UK-based Canonical Ltd., a company owned by South African entrepreneur Mark Shuttleworth. Canonical generates revenue through the sale of technical support and other services related to Ubuntu. The Ubuntu project is publicly committed to the principles of open-source software development; people are encouraged to use free software, study how it works, improve upon it, and distribute it. + +> [wikipedia.org/wiki/Ubuntu_(operating_system)](https://en.wikipedia.org/wiki/Ubuntu_%28operating_system%29) + +![logo](https://raw.githubusercontent.com/docker-library/docs/master/ubuntu/logo.png) + +# What's in this image? + +## `/etc/apt/sources.list` + +### `ubuntu:14.04` $ docker run ubuntu:14.04 grep -v '^#' /etc/apt/sources.list @@ -30,7 +42,7 @@ For more information about this image and its history, please see the [relevant deb http://archive.ubuntu.com/ubuntu/ trusty-security universe deb-src http://archive.ubuntu.com/ubuntu/ trusty-security universe -\- +### `ubuntu:12.04` $ docker run ubuntu:12.04 cat /etc/apt/sources.list