浏览代码

Run update.sh, add r-base user-feedback override

Joe Ferguson 11 年之前
父节点
当前提交
71d87abbee
共有 11 个文件被更改,包括 63 次插入44 次删除
  1. 3 3
      centos/README.md
  2. 4 4
      golang/README.md
  3. 6 6
      java/README.md
  4. 1 1
      jruby/README.md
  5. 2 2
      mysql/README.md
  6. 1 1
      nginx/README.md
  7. 6 6
      node/README.md
  8. 15 15
      r-base/README.md
  9. 18 0
      r-base/user-feedback.md
  10. 6 6
      tomcat/README.md
  11. 1 0
      update.sh

+ 3 - 3
centos/README.md

@@ -1,8 +1,8 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`latest`, `centos7` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/b28be06c817337e83103afa179965ac47dcc5e7c/docker/Dockerfile)
-- [`centos6` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/d22f4c466eeba45c1593b5d13d8636ff23bdf062/docker/Dockerfile)
-- [`centos5` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/f8d27d6f2581846042f303cf5a318f42588d515d/docker/Dockerfile)
+- [`latest`, `centos7` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/3bb7881b87349a1e8ce79302163baab3879837fc/docker/Dockerfile)
+- [`centos6` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/92c2e02e88c2a3faff13d199ce61d7342456ae50/docker/Dockerfile)
+- [`centos5` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/6e198b3ad7a20b8b4fab2720b7ca0b8019acc593/docker/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 4 - 4
golang/README.md

@@ -7,10 +7,10 @@
 - [`1.3.3-onbuild`, `1.3-onbuild`, `1-onbuild`, `onbuild` (*1.3/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/4d4b14164e50c089a09b9364697749dc7f764824/1.3/onbuild/Dockerfile)
 - [`1.3.3-cross`, `1.3-cross`, `1-cross`, `cross` (*1.3/cross/Dockerfile*)](https://github.com/docker-library/golang/blob/acc4ed5ba8dfad17bd484ac858950bc6a6f9acde/1.3/cross/Dockerfile)
 - [`1.3.3-wheezy`, `1.3-wheezy`, `1-wheezy`, `wheezy` (*1.3/wheezy/Dockerfile*)](https://github.com/docker-library/golang/blob/b13bdad8632705cd56f887ffe7320076b1b56754/1.3/wheezy/Dockerfile)
-- [`1.4rc1`, `1.4` (*1.4/Dockerfile*)](https://github.com/docker-library/golang/blob/b13bdad8632705cd56f887ffe7320076b1b56754/1.4/Dockerfile)
-- [`1.4rc1-onbuild`, `1.4-onbuild` (*1.4/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/1bab172aa5ca0675891ca58411f067a1b95a10d6/1.4/onbuild/Dockerfile)
-- [`1.4rc1-cross`, `1.4-cross` (*1.4/cross/Dockerfile*)](https://github.com/docker-library/golang/blob/898bf4174e6a575ae311d14a23f96b4f6724ee13/1.4/cross/Dockerfile)
-- [`1.4rc1-wheezy`, `1.4-wheezy` (*1.4/wheezy/Dockerfile*)](https://github.com/docker-library/golang/blob/b13bdad8632705cd56f887ffe7320076b1b56754/1.4/wheezy/Dockerfile)
+- [`1.4rc2`, `1.4` (*1.4/Dockerfile*)](https://github.com/docker-library/golang/blob/ebb35315f1b0a48eb17eb9f17a7bd66132fd8813/1.4/Dockerfile)
+- [`1.4rc2-onbuild`, `1.4-onbuild` (*1.4/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/ebb35315f1b0a48eb17eb9f17a7bd66132fd8813/1.4/onbuild/Dockerfile)
+- [`1.4rc2-cross`, `1.4-cross` (*1.4/cross/Dockerfile*)](https://github.com/docker-library/golang/blob/ebb35315f1b0a48eb17eb9f17a7bd66132fd8813/1.4/cross/Dockerfile)
+- [`1.4rc2-wheezy`, `1.4-wheezy` (*1.4/wheezy/Dockerfile*)](https://github.com/docker-library/golang/blob/ebb35315f1b0a48eb17eb9f17a7bd66132fd8813/1.4/wheezy/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 6 - 6
java/README.md

@@ -1,11 +1,11 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`openjdk-6b32-jdk`, `openjdk-6b32`, `openjdk-6-jdk`, `openjdk-6`, `6b32-jdk`, `6b32`, `6-jdk`, `6` (*openjdk-6-jdk/Dockerfile*)](https://github.com/docker-library/java/blob/9b3b7ed1bdd754fa61b5dd86c0bcd3e3400c6a33/openjdk-6-jdk/Dockerfile)
-- [`openjdk-6b32-jre`, `openjdk-6-jre`, `6b32-jre`, `6-jre` (*openjdk-6-jre/Dockerfile*)](https://github.com/docker-library/java/blob/d2acc0356b5a68a4d168462a3f5f0e29444982b9/openjdk-6-jre/Dockerfile)
-- [`openjdk-7u71-jdk`, `openjdk-7u71`, `openjdk-7-jdk`, `openjdk-7`, `7u71-jdk`, `7u71`, `7-jdk`, `7`, `jdk`, `latest` (*openjdk-7-jdk/Dockerfile*)](https://github.com/docker-library/java/blob/4ab314dc41cb31313f630ce5e11398ef0f9e9ae9/openjdk-7-jdk/Dockerfile)
-- [`openjdk-7u71-jre`, `openjdk-7-jre`, `7u71-jre`, `7-jre`, `jre` (*openjdk-7-jre/Dockerfile*)](https://github.com/docker-library/java/blob/4ab314dc41cb31313f630ce5e11398ef0f9e9ae9/openjdk-7-jre/Dockerfile)
-- [`openjdk-8u40-b09-jdk`, `openjdk-8u40-b09`, `openjdk-8u40-jdk`, `openjdk-8u40`, `openjdk-8-jdk`, `openjdk-8`, `8u40-b09-jdk`, `8u40-b09`, `8u40-jdk`, `8u40`, `8-jdk`, `8` (*openjdk-8-jdk/Dockerfile*)](https://github.com/docker-library/java/blob/1b4378dc7b57c8534fe715cfcec356ee96c87e92/openjdk-8-jdk/Dockerfile)
-- [`openjdk-8u40-b09-jre`, `openjdk-8u40-jre`, `openjdk-8-jre`, `8u40-b09-jre`, `8u40-jre`, `8-jre` (*openjdk-8-jre/Dockerfile*)](https://github.com/docker-library/java/blob/1b4378dc7b57c8534fe715cfcec356ee96c87e92/openjdk-8-jre/Dockerfile)
+- [`openjdk-6b33-jdk`, `openjdk-6b33`, `openjdk-6-jdk`, `openjdk-6`, `6b33-jdk`, `6b33`, `6-jdk`, `6` (*openjdk-6-jdk/Dockerfile*)](https://github.com/docker-library/java/blob/2408508f3b000bf997febbdb90a861185a64a260/openjdk-6-jdk/Dockerfile)
+- [`openjdk-6b33-jre`, `openjdk-6-jre`, `6b33-jre`, `6-jre` (*openjdk-6-jre/Dockerfile*)](https://github.com/docker-library/java/blob/2408508f3b000bf997febbdb90a861185a64a260/openjdk-6-jre/Dockerfile)
+- [`openjdk-7u71-jdk`, `openjdk-7u71`, `openjdk-7-jdk`, `openjdk-7`, `7u71-jdk`, `7u71`, `7-jdk`, `7`, `jdk`, `latest` (*openjdk-7-jdk/Dockerfile*)](https://github.com/docker-library/java/blob/2408508f3b000bf997febbdb90a861185a64a260/openjdk-7-jdk/Dockerfile)
+- [`openjdk-7u71-jre`, `openjdk-7-jre`, `7u71-jre`, `7-jre`, `jre` (*openjdk-7-jre/Dockerfile*)](https://github.com/docker-library/java/blob/2408508f3b000bf997febbdb90a861185a64a260/openjdk-7-jre/Dockerfile)
+- [`openjdk-8u40-b09-jdk`, `openjdk-8u40-b09`, `openjdk-8u40-jdk`, `openjdk-8u40`, `openjdk-8-jdk`, `openjdk-8`, `8u40-b09-jdk`, `8u40-b09`, `8u40-jdk`, `8u40`, `8-jdk`, `8` (*openjdk-8-jdk/Dockerfile*)](https://github.com/docker-library/java/blob/2408508f3b000bf997febbdb90a861185a64a260/openjdk-8-jdk/Dockerfile)
+- [`openjdk-8u40-b09-jre`, `openjdk-8u40-jre`, `openjdk-8-jre`, `8u40-b09-jre`, `8u40-jre`, `8-jre` (*openjdk-8-jre/Dockerfile*)](https://github.com/docker-library/java/blob/2408508f3b000bf997febbdb90a861185a64a260/openjdk-8-jre/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 1 - 1
jruby/README.md

@@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links
 
 - [`1.7`, `1.7.16`, `1.7.16.1`, `latest` (*1.7/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/fe814254b51c4f619ec2561df421259c32b27c63/1.7/Dockerfile)
-- [`dev` (*9000/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/384671d2c1b26465a38c6f9e645024b3ab217bad/9000/Dockerfile)
+- [`dev` (*9000/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/9ceb1fcc3eddd71260ff7486f168edbda3974f87/9000/Dockerfile)
 - [`1.7-onbuild`, `1.7.16-onbuild` (*1.7/onbuild/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/10eae9359611104c013e82206104b40f20fac377/1.7/onbuild/Dockerfile)
 
 For more information about this image and its history, please see the [relevant

+ 2 - 2
mysql/README.md

@@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`5.5.40`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/docker-mysql/blob/06bcb63a0b42ed24ef7509c3352e2cf45d139a5e/5.5/Dockerfile)
-- [`5.6.21`, `5.6`, `5`, `latest` (*5.6/Dockerfile*)](https://github.com/docker-library/docker-mysql/blob/06bcb63a0b42ed24ef7509c3352e2cf45d139a5e/5.6/Dockerfile)
+- [`5.5.41`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/docker-mysql/blob/29c5caa79a5331f1ad52805f9ca588fd03d81abd/5.5/Dockerfile)
+- [`5.6.22`, `5.6`, `5`, `latest` (*5.6/Dockerfile*)](https://github.com/docker-library/docker-mysql/blob/29c5caa79a5331f1ad52805f9ca588fd03d81abd/5.6/Dockerfile)
 - [`5.7.5-m15`, `5.7.5`, `5.7` (*5.7/Dockerfile*)](https://github.com/docker-library/docker-mysql/blob/06bcb63a0b42ed24ef7509c3352e2cf45d139a5e/5.7/Dockerfile)
 
 For more information about this image and its history, please see the [relevant

+ 1 - 1
nginx/README.md

@@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`latest`, `1`, `1.7`, `1.7.7` (*Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/66d3b5a0ece894c213c16af5753bc52be9ebb1e6/Dockerfile)
+- [`latest`, `1`, `1.7`, `1.7.8` (*Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/04d0c5754673d6880b91e94c3cebaa767d9a1af7/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 6 - 6
node/README.md

@@ -1,14 +1,14 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`0.10.33`, `0.10`, `0`, `latest` (*0.10/Dockerfile*)](https://github.com/docker-library/node/blob/57dd55534374b98309c13cd19e00691f5479ddf0/0.10/Dockerfile)
+- [`0.10.33`, `0.10`, `0`, `latest` (*0.10/Dockerfile*)](https://github.com/docker-library/node/blob/675db6a4622efcbe03c48ed5f1f420aef4de2781/0.10/Dockerfile)
 - [`0.10.33-onbuild`, `0.10-onbuild`, `0-onbuild`, `onbuild` (*0.10/onbuild/Dockerfile*)](https://github.com/docker-library/node/blob/806873187edbff36d7fc294a62131f4f28fa681a/0.10/onbuild/Dockerfile)
-- [`0.10.33-slim`, `0.10-slim`, `0-slim`, `slim` (*0.10/slim/Dockerfile*)](https://github.com/docker-library/node/blob/57dd55534374b98309c13cd19e00691f5479ddf0/0.10/slim/Dockerfile)
-- [`0.11.14`, `0.11` (*0.11/Dockerfile*)](https://github.com/docker-library/node/blob/57dd55534374b98309c13cd19e00691f5479ddf0/0.11/Dockerfile)
+- [`0.10.33-slim`, `0.10-slim`, `0-slim`, `slim` (*0.10/slim/Dockerfile*)](https://github.com/docker-library/node/blob/675db6a4622efcbe03c48ed5f1f420aef4de2781/0.10/slim/Dockerfile)
+- [`0.11.14`, `0.11` (*0.11/Dockerfile*)](https://github.com/docker-library/node/blob/675db6a4622efcbe03c48ed5f1f420aef4de2781/0.11/Dockerfile)
 - [`0.11.14-onbuild`, `0.11-onbuild` (*0.11/onbuild/Dockerfile*)](https://github.com/docker-library/node/blob/ac05e7f96c477223f0d2da1817e84403363a65e8/0.11/onbuild/Dockerfile)
-- [`0.11.14-slim`, `0.11-slim` (*0.11/slim/Dockerfile*)](https://github.com/docker-library/node/blob/57dd55534374b98309c13cd19e00691f5479ddf0/0.11/slim/Dockerfile)
-- [`0.8.28`, `0.8` (*0.8/Dockerfile*)](https://github.com/docker-library/node/blob/57dd55534374b98309c13cd19e00691f5479ddf0/0.8/Dockerfile)
+- [`0.11.14-slim`, `0.11-slim` (*0.11/slim/Dockerfile*)](https://github.com/docker-library/node/blob/675db6a4622efcbe03c48ed5f1f420aef4de2781/0.11/slim/Dockerfile)
+- [`0.8.28`, `0.8` (*0.8/Dockerfile*)](https://github.com/docker-library/node/blob/675db6a4622efcbe03c48ed5f1f420aef4de2781/0.8/Dockerfile)
 - [`0.8.28-onbuild`, `0.8-onbuild` (*0.8/onbuild/Dockerfile*)](https://github.com/docker-library/node/blob/ac05e7f96c477223f0d2da1817e84403363a65e8/0.8/onbuild/Dockerfile)
-- [`0.8.28-slim`, `0.8-slim` (*0.8/slim/Dockerfile*)](https://github.com/docker-library/node/blob/57dd55534374b98309c13cd19e00691f5479ddf0/0.8/slim/Dockerfile)
+- [`0.8.28-slim`, `0.8-slim` (*0.8/slim/Dockerfile*)](https://github.com/docker-library/node/blob/675db6a4622efcbe03c48ed5f1f420aef4de2781/0.8/slim/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 15 - 15
r-base/README.md

@@ -1,12 +1,12 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`3.1.2` (*3.1.2/Dockerfile*)](https://github.com/rocker-org/rocker/blob/105fca2b42051c5cd0894da31839c99a9b7de320/debian/r-base/Dockerfile)
-
-For more information about this image and its history, please see the
-[relevant manifest file (`library/r-base`)](https://github.com/rocker-org/official-images/blob/master/library/r-base)
-and the 
-[`rocker-org/rocker` GitHub repo](https://github.com/rocker-org/rocker).
+- [`latest`, `3.1.2` (*debian/r-base/Dockerfile*)](https://github.com/rocker-org/rocker/blob/105fca2b42051c5cd0894da31839c99a9b7de320/debian/r-base/Dockerfile)
 
+For more information about this image and its history, please see the [relevant
+manifest file
+(`library/r-base`)](https://github.com/docker-library/official-images/blob/master/library/r-base)
+in the [`docker-library/official-images` GitHub
+repo](https://github.com/docker-library/official-images).
 
 # What is R?
 
@@ -77,9 +77,10 @@ Build your image with the command:
 
 Running this container with no command will execute the script. Alternatively, a user could run this container in interactive or batch mode as described above, instead of linking volumes.
 
-Further documentation and example use cases can be found at the [rocker-org](https://github.com/rocker-org/rocker/wiki) project wiki.
 
 
+Further documentation and example use cases can be found at the [rocker-org](https://github.com/rocker-org/rocker/wiki) project wiki.
+
 # License
 
 View [R-project license information](http://www.r-project.org/Licenses/) for the software contained in this image.
@@ -88,20 +89,19 @@ View [R-project license information](http://www.r-project.org/Licenses/) for the
 
 ## Issues
 
-If you have any problems with or questions about this image, please contact
-us through a [GitHub issue](https://github.com/rocker-org/rocker/issues).
+If you have any problems with or questions about this image, please contact us
+ through a [GitHub issue](https://github.com/rocker-org/rocker/issues).
 
 You can also reach us by email via email at `[email protected]`.
 
-
 ## Contributing
 
 You are invited to contribute new features, fixes, or updates, large or small;
 we are always thrilled to receive pull requests, and do our best to process them
 as fast as we can.
 
-Before you start to code, we recommend discussing your plans through a
-[GitHub issue](https://github.com/rocker-org/rocker/issues), especially for
-more ambitious contributions. This gives other contributors a chance to point
-you in the right direction, give you feedback on your design, and help you
-find out if someone else is working on the same thing.
+Before you start to code, we recommend discussing your plans 
+through a [GitHub issue](https://github.com/rocker-org/rocker/issues), especially for more ambitious
+contributions. This gives other contributors a chance to point you in the right
+direction, give you feedback on your design, and help you find out if someone
+else is working on the same thing.

+ 18 - 0
r-base/user-feedback.md

@@ -0,0 +1,18 @@
+## Issues
+
+If you have any problems with or questions about this image, please contact us
+%%MAILING_LIST%% through a [GitHub issue](%%GITHUB_REPO%%/issues).
+
+You can also reach us by email via email at `[email protected]`.
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small;
+we are always thrilled to receive pull requests, and do our best to process them
+as fast as we can.
+
+Before you start to code, we recommend discussing your plans %%MAILING_LIST%%
+through a [GitHub issue](%%GITHUB_REPO%%/issues), especially for more ambitious
+contributions. This gives other contributors a chance to point you in the right
+direction, give you feedback on your design, and help you find out if someone
+else is working on the same thing.

+ 6 - 6
tomcat/README.md

@@ -1,11 +1,11 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`6.0.43-jre7`, `6.0-jre7`, `6-jre7`, `6.0.43`, `6.0`, `6` (*6-jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/452e2d4dcb58e3d044a6288befab6d717f94590e/6-jre7/Dockerfile)
-- [`6.0.43-jre8`, `6.0-jre8`, `6-jre8` (*6-jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/e826a7e6953f03f8fa03a9faed70721d6de1d3df/6-jre8/Dockerfile)
-- [`7.0.57-jre7`, `7.0-jre7`, `7-jre7`, `7.0.57`, `7.0`, `7` (*7-jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/88b51c6d19c83b689221d5eb2e9489d9d36ed8db/7-jre7/Dockerfile)
-- [`7.0.57-jre8`, `7.0-jre8`, `7-jre8` (*7-jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/9c2fb18446d9e6841997362e575804da73f23eee/7-jre8/Dockerfile)
-- [`8.0.15-jre7`, `8.0-jre7`, `8-jre7`, `jre7`, `8.0.15`, `8.0`, `8`, `latest` (*8-jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/aff42b3c40f2dff08b421fce66b81983706bfc50/8-jre7/Dockerfile)
-- [`8.0.15-jre8`, `8.0-jre8`, `8-jre8`, `jre8` (*8-jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/9c2fb18446d9e6841997362e575804da73f23eee/8-jre8/Dockerfile)
+- [`6.0.43-jre7`, `6.0-jre7`, `6-jre7`, `6.0.43`, `6.0`, `6` (*6-jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/6f1c628fa92feea8b28e98e56a990500f2326936/6-jre7/Dockerfile)
+- [`6.0.43-jre8`, `6.0-jre8`, `6-jre8` (*6-jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/6f1c628fa92feea8b28e98e56a990500f2326936/6-jre8/Dockerfile)
+- [`7.0.57-jre7`, `7.0-jre7`, `7-jre7`, `7.0.57`, `7.0`, `7` (*7-jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/6f1c628fa92feea8b28e98e56a990500f2326936/7-jre7/Dockerfile)
+- [`7.0.57-jre8`, `7.0-jre8`, `7-jre8` (*7-jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/6f1c628fa92feea8b28e98e56a990500f2326936/7-jre8/Dockerfile)
+- [`8.0.15-jre7`, `8.0-jre7`, `8-jre7`, `jre7`, `8.0.15`, `8.0`, `8`, `latest` (*8-jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/6f1c628fa92feea8b28e98e56a990500f2326936/8-jre7/Dockerfile)
+- [`8.0.15-jre8`, `8.0-jre8`, `8-jre8`, `jre8` (*8-jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/6f1c628fa92feea8b28e98e56a990500f2326936/8-jre8/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 1 - 0
update.sh

@@ -42,6 +42,7 @@ declare -A otherRepos=(
 	[opensuse]='https://github.com/openSUSE/docker-containers-build'
 	[perl]='https://github.com/Perl/docker-perl'
 	[registry]='https://github.com/docker/docker-registry'
+	[r-base]='https://github.com/rocker-org/rocker'
 	[ubuntu-debootstrap]='https://github.com/tianon/docker-brew-ubuntu-debootstrap'
 	[ubuntu-upstart]='https://github.com/tianon/dockerfiles'
 	[ubuntu]='https://github.com/tianon/docker-brew-ubuntu-core'