Просмотр исходного кода

Merge pull request #659 from infosiftr/ubuntu-xenial

Update Ubuntu description to remove "ubuntu:12.04" and add "ubuntu:16.04" in the example "/etc/apt/sources.list" content section
yosifkit 9 лет назад
Родитель
Сommit
3f4341fa4b
1 измененных файлов с 23 добавлено и 23 удалено
  1. 23 23
      ubuntu/content.md

+ 23 - 23
ubuntu/content.md

@@ -12,6 +12,29 @@ Development of Ubuntu is led by UK-based Canonical Ltd., a company owned by Sout
 
 ## `/etc/apt/sources.list`
 
+### `ubuntu:16.04`
+
+```console
+$ docker run ubuntu:16.04 grep -v '^#' /etc/apt/sources.list
+
+deb http://archive.ubuntu.com/ubuntu/ xenial main restricted
+deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted
+
+deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted
+deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted
+
+deb http://archive.ubuntu.com/ubuntu/ xenial universe
+deb-src http://archive.ubuntu.com/ubuntu/ xenial universe
+deb http://archive.ubuntu.com/ubuntu/ xenial-updates universe
+deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates universe
+
+
+deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted
+deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted
+deb http://archive.ubuntu.com/ubuntu/ xenial-security universe
+deb-src http://archive.ubuntu.com/ubuntu/ xenial-security universe
+```
+
 ### `ubuntu:14.04`
 
 ```console
@@ -34,26 +57,3 @@ deb-src http://archive.ubuntu.com/ubuntu/ trusty-security main restricted
 deb http://archive.ubuntu.com/ubuntu/ trusty-security universe
 deb-src http://archive.ubuntu.com/ubuntu/ trusty-security universe
 ```
-
-### `ubuntu:12.04`
-
-```console
-$ docker run ubuntu:12.04 cat /etc/apt/sources.list
-
-deb http://archive.ubuntu.com/ubuntu/ precise main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ precise main restricted
-
-deb http://archive.ubuntu.com/ubuntu/ precise-updates main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ precise-updates main restricted
-
-deb http://archive.ubuntu.com/ubuntu/ precise universe
-deb-src http://archive.ubuntu.com/ubuntu/ precise universe
-deb http://archive.ubuntu.com/ubuntu/ precise-updates universe
-deb-src http://archive.ubuntu.com/ubuntu/ precise-updates universe
-
-
-deb http://archive.ubuntu.com/ubuntu/ precise-security main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ precise-security main restricted
-deb http://archive.ubuntu.com/ubuntu/ precise-security universe
-deb-src http://archive.ubuntu.com/ubuntu/ precise-security universe
-```