瀏覽代碼

Run update.sh

Docker Library Bot 7 年之前
父節點
當前提交
0cf83f4789
共有 1 個文件被更改,包括 20 次插入26 次删除
  1. 20 26
      amazonlinux/README.md

+ 20 - 26
amazonlinux/README.md

@@ -16,16 +16,10 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`2017.12.0.20180330`, `2017.12`, `2` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/91cc3997375a8055ae62ffa2635acc464ec8ac51/Dockerfile)
--	[`2017.12.0.20180330-with-sources`, `2017.12-with-sources`, `2-with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/9129377feea1176b636427b295e8af57656db079/Dockerfile)
--	[`2018.03.0.20180424`, `2018.03`, `1`, `latest` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/2d98947f57ed4afe97daef60f4c05ec5e4adc69d/Dockerfile)
--	[`2018.03.0.20180424-with-sources`, `2018.03-with-sources`, `1-with-sources`, `with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/e323bc6480b6eb08de5ed48f5d049aa04dcef7d3/Dockerfile)
--	[`2017.09.1.20180409`, `2017.09` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/0b2dad813345cab464c6c0a716aa5be2ae072f79/Dockerfile)
--	[`2017.09.1.20180409-with-sources`, `2017.09-with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/6d5273cf53b85c27690ac394bee2c2935cca73b8/Dockerfile)
--	[`2017.03.1.20170812`, `2017.03` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/577139a6f2571e3adb59cfd34d61bc07e2fba238/Dockerfile)
--	[`2017.03.1.20170812-with-sources`, `2017.03-with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/47f91aec4a189232a7feb1ec544a3a6af0347113/Dockerfile)
--	[`2016.09.1.20161221`, `2016.09` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/e1b56e68ebd2b274c64e0a0a18ae0a9a8122822d/Dockerfile)
--	[`2016.09.1.20161221-with-sources`, `2016.09-with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/2de60e8c98421694c293639659a88ed81ce29298/Dockerfile)
+-	[`2.0.20180622.1`, `2`, `latest` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/d59369b8dc1f3a41231d550274a565a349fb326b/Dockerfile)
+-	[`2.0.20180622.1-with-sources`, `2-with-sources`, `with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/54ffc6812a9912808ead357a6cb757c4db671121/Dockerfile)
+-	[`2018.03.0.20180622`, `2018.03`, `1` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/790dac3b115c84613ae36e48491db746e4b7503d/Dockerfile)
+-	[`2018.03.0.20180622-with-sources`, `2018.03-with-sources`, `1-with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/299dd79dcf37b9354decee89bc243b95c7cddbaf/Dockerfile)
 
 # Quick reference
 
@@ -61,7 +55,7 @@ Amazon Linux is provided by Amazon Web Services (AWS). It is designed to provide
 
 The Amazon Linux container image contains a minimal set of packages. To install additional packages, [use `yum`](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/managing-software.html).
 
-AWS provides two versions of Amazon Linux: [Amazon Linux 2](https://aws.amazon.com/amazon-linux-2/) LTS Candidate and [Amazon Linux AMI](https://aws.amazon.com/amazon-linux-ami/).
+AWS provides two versions of Amazon Linux: [Amazon Linux 2](https://aws.amazon.com/amazon-linux-2/) and [Amazon Linux AMI](https://aws.amazon.com/amazon-linux-ami/).
 
 ![logo](https://raw.githubusercontent.com/docker-library/docs/9ca9202567ccc25ce110f98bbeb6c929844e05d0/amazonlinux/logo.png)
 
@@ -69,37 +63,37 @@ AWS provides two versions of Amazon Linux: [Amazon Linux 2](https://aws.amazon.c
 
 You can run Amazon Linux container images in any Docker based environment. Examples include, your laptop, in AWS EC2 instances, and ECS clusters.
 
-## How is Amazon Linux 2 LTS Candidate different from Amazon Linux AMI?
+## How is Amazon Linux 2 different from Amazon Linux AMI?
 
-There are three major differences in Amazon Linux 2 LTS Candidate from its predecessors:
+There are three major differences in Amazon Linux 2 from its predecessors:
 
 1.	it is available as a VM image for on-premises development and testing
 2.	it includes systemd service and systems manager as opposed to System V init system and also includes new version of compiler and build tools
 3.	it gives you the ability to install additional software packages through Extras mechanism without impacting the underlying LTS stability
 
-## Is Amazon Linux 2 LTS Candidate (2017.12) build an official LTS build?
+## Is Amazon Linux 2 build an official LTS build?
 
-No, Amazon Linux 2 (2017.12) is a first candidate LTS build of Amazon Linux 2. In the coming weeks, we will continue to engage with our customers and the broader community to get feedback before announcing an official LTS build which will be supported for 5 years. You can provide your feedback through your designated AWS representative or directly through [Amazon Linux Discussion Forum](https://forums.aws.amazon.com/forum.jspa?forumID=228).
+Yes. Amazon Linux 2 is supported by AWS for five years after release (June 2018).
 
 ## What packages are available in the Amazon Linux containers?
 
-Amazon Linux Docker container images contain a subset of the packages in the images for use on EC2 and as VMs in on-premises scenarios. The container images can be configured to use any of the full set of packages in images for EC2 and on-premises use. The Amazon Linux 2 LTS Candidate Container images comes with Extras included.
+Amazon Linux Docker container images contain a subset of the packages in the images for use on EC2 and as VMs in on-premises scenarios. The container images can be configured to use any of the full set of packages in images for EC2 and on-premises use. The Amazon Linux 2 container images comes with Extras included.
 
-## What is an Amazon Linux 2 LTS Candidate Extra?
+## What is an Amazon Linux 2 Extra?
 
-Extras is a new mechanism introduced in Amazon Linux 2 to enable the consumption of the newest versions of application software in a fully supported manner on a stable Amazon Linux 2 base. Extras help alleviate the compromise between stability of the OS and freshness of available software. For example, now you can install newer versions of Python being rest assured that the underlying operating system is stable. Examples of Extras include Python 3, nginx, Postgresql, MariaDB, Go, and Rust.
+Extras is a new mechanism introduced in Amazon Linux 2 to enable the consumption of the newest versions of application software in a fully supported manner on a stable Amazon Linux 2 base. Extras help alleviate the compromise between stability of the OS and freshness of available software. For example, now you can install newer versions of Python being rest assured that the underlying operating system is stable. Examples of Extras include nginx, PostgreSQL, MariaDB, Go, and Rust.
 
-## How do Amazon Linux 2 LTS Candidate Extras work?
+## How do Amazon Linux 2 Extras work?
 
 Extras introduces the notion of topics to select software bundles. Each topic contains all the dependencies required for the software to install and function on Amazon Linux 2. For example, Rust is an Extras topic in the curated list provide by Amazon. It provides the toolchain and runtimes for Rust, the systems programming language. This topic includes the cmake build system for Rust, cargo - the rust package manager, and the LLVM based compiler toolchain for Rust. The packages associated with each topic are consumed via the well-known yum installation process.
 
-## How are Amazon Linux 2 LTS Candidate Extras topics different from the packages available in yum repositories?
+## How are Amazon Linux 2 Extras topics different from the packages available in yum repositories?
 
 `yum` is a utility for package management of RPM packages. The base image of Amazon Linux 2 (LTS) includes access to repositories that already contain stable versions of popular packages that can be installed with yum. These packages are part of the long term support for Amazon Linux 2.
 
-However, if you need a new software package or a newer version of an existing software package that is not included in the base Amazon Linux 2 LTS Candidate image, Extras provide a way to install those packages in a supported manner. Extras is essentially a simplified mechanism to point yum to AWS curated sets of packages for a selected topic.
+However, if you need a new software package or a newer version of an existing software package that is not included in the base Amazon Linux 2 image, Extras provide a way to install those packages in a supported manner. Extras is essentially a simplified mechanism to point yum to AWS curated sets of packages for a selected topic.
 
-## How do I install a software package from Extras repository in Amazon Linux 2 LTS Candidate?
+## How do I install a software package from Extras repository in Amazon Linux 2?
 
 Available packages can be listed with the `amazon-linux-extras` command. Packages can be installed with the `sudo amazon-linux-extras install <package>` command. Example: sudo amazon-linux-extras install rust1
 
@@ -113,15 +107,15 @@ Similar to the Amazon Linux images for AWS EC2 and on-premises use, Amazon Linux
 -	Amazon Linux Forums: https://forums.aws.amazon.com/forum.jspa?forumID=228
 -	Paid Support from AWS: https://aws.amazon.com/premiumsupport/
 
-## With the availability of Amazon Linux 2 LTS Candidate, are there any changes to the existing version of Amazon Linux AMI (2017.09)?
+## With the availability of Amazon Linux 2, are there any changes to the existing version of Amazon Linux AMI?
 
-With the availability of Amazon Linux 2, we are announcing that 2017.09 release of Amazon Linux AMI container image will be the last release for the current generation of Amazon Linux. Going forward, AWS will provide newer versions only for Amazon Linux 2.
+With the availability of Amazon Linux 2, we are announcing that 2018.03 release of Amazon Linux AMI container image will be the last release for the current generation of Amazon Linux. Going forward, AWS will provide newer versions only for Amazon Linux 2.
 
 ## Will AWS support the current version of Amazon Linux going forward?
 
-Yes; in order to avoid any disruption to your existing applications and to facilitate migration to Amazon Linux 2, AWS will provide regular security updates for Amazon Linux 2017.09 AMI and container image for 2 years after the final LTS build is announced. You can also use all your existing support channels such as AWS Premium Support and Amazon Linux Discussion Forum to continue to submit support requests.
+Yes; in order to avoid any disruption to your existing applications and to facilitate migration to Amazon Linux 2, AWS will provide regular security updates for Amazon Linux 2018.03 AMI and container image for 2 years after the final LTS build is announced. You can also use all your existing support channels such as AWS Premium Support and Amazon Linux Discussion Forum to continue to submit support requests.
 
-## Is Amazon Linux 2 LTS Candidate backward compatible with the existing version of Amazon Linux?
+## Is Amazon Linux 2 backward compatible with Amazon Linux AMI?
 
 Due to the inclusion of new components in Amazon Linux 2 such as systemd, your applications running on the current version of Amazon Linux may require additional changes to run on Amazon Linux 2.