Răsfoiți Sursa

Run update.sh

Docker Library Bot 4 ani în urmă
părinte
comite
82ebcabf6f
2 a modificat fișierele cu 6 adăugiri și 20 ștergeri
  1. 0 18
      openjdk/README.md
  2. 6 2
      ubuntu/README.md

+ 0 - 18
openjdk/README.md

@@ -48,15 +48,6 @@ WARNING:
 -	[`17.0.1-jdk-windowsservercore-1809`, `17.0.1-windowsservercore-1809`, `17.0-jdk-windowsservercore-1809`, `17.0-windowsservercore-1809`, `17-jdk-windowsservercore-1809`, `17-windowsservercore-1809`, `jdk-windowsservercore-1809`, `windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/41610205127c2a4f0af64f68b859726993503a89/17/jdk/windows/windowsservercore-1809/Dockerfile)
 -	[`17.0.1-jdk-windowsservercore-ltsc2016`, `17.0.1-windowsservercore-ltsc2016`, `17.0-jdk-windowsservercore-ltsc2016`, `17.0-windowsservercore-ltsc2016`, `17-jdk-windowsservercore-ltsc2016`, `17-windowsservercore-ltsc2016`, `jdk-windowsservercore-ltsc2016`, `windowsservercore-ltsc2016`](https://github.com/docker-library/openjdk/blob/41610205127c2a4f0af64f68b859726993503a89/17/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
 -	[`17.0.1-jdk-nanoserver-1809`, `17.0.1-nanoserver-1809`, `17.0-jdk-nanoserver-1809`, `17.0-nanoserver-1809`, `17-jdk-nanoserver-1809`, `17-nanoserver-1809`, `jdk-nanoserver-1809`, `nanoserver-1809`](https://github.com/docker-library/openjdk/blob/41610205127c2a4f0af64f68b859726993503a89/17/jdk/windows/nanoserver-1809/Dockerfile)
--	[`16.0.2-jdk-oraclelinux8`, `16.0.2-oraclelinux8`, `16.0-jdk-oraclelinux8`, `16.0-oraclelinux8`, `16-jdk-oraclelinux8`, `16-oraclelinux8`, `16.0.2-jdk-oracle`, `16.0.2-oracle`, `16.0-jdk-oracle`, `16.0-oracle`, `16-jdk-oracle`, `16-oracle`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/oraclelinux8/Dockerfile)
--	[`16.0.2-jdk-oraclelinux7`, `16.0.2-oraclelinux7`, `16.0-jdk-oraclelinux7`, `16.0-oraclelinux7`, `16-jdk-oraclelinux7`, `16-oraclelinux7`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/oraclelinux7/Dockerfile)
--	[`16.0.2-jdk-bullseye`, `16.0.2-bullseye`, `16.0-jdk-bullseye`, `16.0-bullseye`, `16-jdk-bullseye`, `16-bullseye`](https://github.com/docker-library/openjdk/blob/ac338f3112ad10269fc2d21d9104570454ca064b/16/jdk/bullseye/Dockerfile)
--	[`16.0.2-jdk-slim-bullseye`, `16.0.2-slim-bullseye`, `16.0-jdk-slim-bullseye`, `16.0-slim-bullseye`, `16-jdk-slim-bullseye`, `16-slim-bullseye`, `16.0.2-jdk-slim`, `16.0.2-slim`, `16.0-jdk-slim`, `16.0-slim`, `16-jdk-slim`, `16-slim`](https://github.com/docker-library/openjdk/blob/ac338f3112ad10269fc2d21d9104570454ca064b/16/jdk/slim-bullseye/Dockerfile)
--	[`16.0.2-jdk-buster`, `16.0.2-buster`, `16.0-jdk-buster`, `16.0-buster`, `16-jdk-buster`, `16-buster`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/buster/Dockerfile)
--	[`16.0.2-jdk-slim-buster`, `16.0.2-slim-buster`, `16.0-jdk-slim-buster`, `16.0-slim-buster`, `16-jdk-slim-buster`, `16-slim-buster`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/slim-buster/Dockerfile)
--	[`16.0.2-jdk-windowsservercore-1809`, `16.0.2-windowsservercore-1809`, `16.0-jdk-windowsservercore-1809`, `16.0-windowsservercore-1809`, `16-jdk-windowsservercore-1809`, `16-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/windows/windowsservercore-1809/Dockerfile)
--	[`16.0.2-jdk-windowsservercore-ltsc2016`, `16.0.2-windowsservercore-ltsc2016`, `16.0-jdk-windowsservercore-ltsc2016`, `16.0-windowsservercore-ltsc2016`, `16-jdk-windowsservercore-ltsc2016`, `16-windowsservercore-ltsc2016`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
--	[`16.0.2-jdk-nanoserver-1809`, `16.0.2-nanoserver-1809`, `16.0-jdk-nanoserver-1809`, `16.0-nanoserver-1809`, `16-jdk-nanoserver-1809`, `16-nanoserver-1809`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/windows/nanoserver-1809/Dockerfile)
 -	[`11.0.12-jdk-oraclelinux8`, `11.0.12-oraclelinux8`, `11.0-jdk-oraclelinux8`, `11.0-oraclelinux8`, `11-jdk-oraclelinux8`, `11-oraclelinux8`, `11.0.12-jdk-oracle`, `11.0.12-oracle`, `11.0-jdk-oracle`, `11.0-oracle`, `11-jdk-oracle`, `11-oracle`](https://github.com/docker-library/openjdk/blob/6c18f690c35e42950119a92d2edd854a869745c5/11/jdk/oraclelinux8/Dockerfile)
 -	[`11.0.12-jdk-oraclelinux7`, `11.0.12-oraclelinux7`, `11.0-jdk-oraclelinux7`, `11.0-oraclelinux7`, `11-jdk-oraclelinux7`, `11-oraclelinux7`](https://github.com/docker-library/openjdk/blob/6c18f690c35e42950119a92d2edd854a869745c5/11/jdk/oraclelinux7/Dockerfile)
 -	[`11.0.12-jdk-bullseye`, `11.0.12-bullseye`, `11.0-jdk-bullseye`, `11.0-bullseye`, `11-jdk-bullseye`, `11-bullseye`](https://github.com/docker-library/openjdk/blob/ac338f3112ad10269fc2d21d9104570454ca064b/11/jdk/bullseye/Dockerfile)
@@ -110,15 +101,6 @@ WARNING:
 	-	[`17.0.1-jdk-windowsservercore-ltsc2016`](https://github.com/docker-library/openjdk/blob/41610205127c2a4f0af64f68b859726993503a89/17/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
 -	`17.0.1-jdk-nanoserver`, `17.0.1-nanoserver`, `17.0-jdk-nanoserver`, `17.0-nanoserver`, `17-jdk-nanoserver`, `17-nanoserver`, `jdk-nanoserver`, `nanoserver`:
 	-	[`17.0.1-jdk-nanoserver-1809`](https://github.com/docker-library/openjdk/blob/41610205127c2a4f0af64f68b859726993503a89/17/jdk/windows/nanoserver-1809/Dockerfile)
--	`16.0.2-jdk`, `16.0.2`, `16.0-jdk`, `16.0`, `16-jdk`, `16`:
-	-	[`16.0.2-jdk-oraclelinux8`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/oraclelinux8/Dockerfile)
-	-	[`16.0.2-jdk-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/windows/windowsservercore-1809/Dockerfile)
-	-	[`16.0.2-jdk-windowsservercore-ltsc2016`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
--	`16.0.2-jdk-windowsservercore`, `16.0.2-windowsservercore`, `16.0-jdk-windowsservercore`, `16.0-windowsservercore`, `16-jdk-windowsservercore`, `16-windowsservercore`:
-	-	[`16.0.2-jdk-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/windows/windowsservercore-1809/Dockerfile)
-	-	[`16.0.2-jdk-windowsservercore-ltsc2016`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile)
--	`16.0.2-jdk-nanoserver`, `16.0.2-nanoserver`, `16.0-jdk-nanoserver`, `16.0-nanoserver`, `16-jdk-nanoserver`, `16-nanoserver`:
-	-	[`16.0.2-jdk-nanoserver-1809`](https://github.com/docker-library/openjdk/blob/d443a298b6b85cfb8652837b945d9df55b98c20d/16/jdk/windows/nanoserver-1809/Dockerfile)
 -	`11.0.12-jdk`, `11.0.12`, `11.0-jdk`, `11.0`, `11-jdk`, `11`:
 	-	[`11.0.12-jdk-bullseye`](https://github.com/docker-library/openjdk/blob/ac338f3112ad10269fc2d21d9104570454ca064b/11/jdk/bullseye/Dockerfile)
 	-	[`11.0.12-jdk-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/6c18f690c35e42950119a92d2edd854a869745c5/11/jdk/windows/windowsservercore-1809/Dockerfile)

+ 6 - 2
ubuntu/README.md

@@ -17,7 +17,7 @@ WARNING:
 # Quick reference
 
 -	**Maintained by**:  
-	[Canonical](https://partner-images.canonical.com/core/) and [Tianon (Debian Developer)](https://github.com/tianon/docker-brew-ubuntu-core)
+	[Canonical](https://launchpad.net/cloud-images) and [Tianon (Debian Developer)](https://github.com/tianon/docker-brew-ubuntu-core)
 
 -	**Where to get help**:  
 	[the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)
@@ -62,7 +62,7 @@ Development of Ubuntu is led by Canonical Ltd. Canonical generates revenue throu
 
 # What's in this image?
 
-This image is built from official rootfs tarballs provided by Canonical (specifically, https://partner-images.canonical.com/core/).
+This image is built from official rootfs tarballs provided by Canonical (specifically, https://partner-images.canonical.com/oci/ for Bionic and later and https://partner-images.canonical.com/core/ for older releases).
 
 The `ubuntu:latest` tag points to the "latest LTS", since that's the version recommended for general use. The `ubuntu:rolling` tag points to the latest release (regardless of LTS status).
 
@@ -80,6 +80,10 @@ RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/*
 ENV LANG en_US.utf8
 ```
 
+# How is the rootfs built?
+
+The [tarballs published by Canonical](https://partner-images.canonical.com/oci/) are built from scripts that live in [the livecd-rootfs project](https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+ref/ubuntu/master), especially `live-build/auto/build`.
+
 # License
 
 View [license information](https://www.ubuntu.com/about/about-ubuntu/licensing) for the software contained in this image.