Browse Source

Run update.sh

Tianon Gravi 10 years ago
parent
commit
b5b11aa680
6 changed files with 41 additions and 11 deletions
  1. 9 4
      buildpack-deps/README.md
  2. 1 1
      crate/README.md
  3. 6 3
      iojs/README.md
  4. 3 2
      iojs/content.md
  5. 1 1
      odoo/README.md
  6. 21 0
      php/README.md

+ 9 - 4
buildpack-deps/README.md

@@ -1,9 +1,14 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`jessie-micro`, `micro` (*jessie/micro/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/fc4bb937881466a88e408f660ce4d8ad18c11bad/jessie/micro/Dockerfile)
-- [`jessie`, `latest` (*jessie/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/fc4bb937881466a88e408f660ce4d8ad18c11bad/jessie/Dockerfile)
-- [`wheezy-micro` (*wheezy/micro/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/fc4bb937881466a88e408f660ce4d8ad18c11bad/wheezy/micro/Dockerfile)
-- [`wheezy` (*wheezy/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/fc4bb937881466a88e408f660ce4d8ad18c11bad/wheezy/Dockerfile)
+- [`jessie-curl`, `curl` (*jessie/curl/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/a0a59c61102e8b079d568db69368fb89421f75f2/jessie/curl/Dockerfile)
+- [`jessie-scm`, `scm` (*jessie/scm/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/a0a59c61102e8b079d568db69368fb89421f75f2/jessie/scm/Dockerfile)
+- [`jessie`, `latest` (*jessie/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/a0a59c61102e8b079d568db69368fb89421f75f2/jessie/Dockerfile)
+- [`sid-curl` (*sid/curl/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/a0a59c61102e8b079d568db69368fb89421f75f2/sid/curl/Dockerfile)
+- [`sid-scm` (*sid/scm/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/a0a59c61102e8b079d568db69368fb89421f75f2/sid/scm/Dockerfile)
+- [`sid` (*sid/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/a0a59c61102e8b079d568db69368fb89421f75f2/sid/Dockerfile)
+- [`wheezy-curl` (*wheezy/curl/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/a0a59c61102e8b079d568db69368fb89421f75f2/wheezy/curl/Dockerfile)
+- [`wheezy-scm` (*wheezy/scm/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/a0a59c61102e8b079d568db69368fb89421f75f2/wheezy/scm/Dockerfile)
+- [`wheezy` (*wheezy/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/a0a59c61102e8b079d568db69368fb89421f75f2/wheezy/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 1 - 1
crate/README.md

@@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`latest`, `0.45`, `0.45.6` (*Dockerfile*)](https://github.com/crate/docker-crate/blob/0.45.6/Dockerfile)
+- [`latest`, `0.45`, `0.45.7` (*Dockerfile*)](https://github.com/crate/docker-crate/blob/0.45.7/Dockerfile)
 - [`0.44`, `0.44.8` (*Dockerfile*)](https://github.com/crate/docker-crate/blob/0.44.8/Dockerfile)
 
 For more information about this image and its history, please see the [relevant

+ 6 - 3
iojs/README.md

@@ -1,6 +1,8 @@
 # Supported tags and respective `Dockerfile` links
 
-
+- [`1.0.3`, `1.0`, `1`, `latest` (*1.0/Dockerfile*)](https://github.com/iojs/docker-iojs/blob/6c86bcac232ec45efae098143559b1e037799338/1.0/Dockerfile)
+- [`1.0.3-onbuild`, `1.0-onbuild`, `1-onbuild`, `onbuild` (*1.0/onbuild/Dockerfile*)](https://github.com/iojs/docker-iojs/blob/6c86bcac232ec45efae098143559b1e037799338/1.0/onbuild/Dockerfile)
+- [`1.0.3-slim`, `1.0-slim`, `1-slim`, `slim` (*1.0/slim/Dockerfile*)](https://github.com/iojs/docker-iojs/blob/6c86bcac232ec45efae098143559b1e037799338/1.0/slim/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file
@@ -9,7 +11,6 @@ in the [`docker-library/official-images` GitHub
 repo](https://github.com/docker-library/official-images).
 
 ## What is io.js?
-*from [iojs.org/faq.html](https://iojs.org/faq.html)*
 
 io.js is a JavaScript platform built on Chrome's V8 runtime. This project began as a fork of Joyent's Node.js™ and is compatible with the npm ecosystem.
 
@@ -17,6 +18,8 @@ Why? io.js aims to provide faster and predictable release cycles. It currently m
 
 This project aims to continue development of io.js under an "open governance model" as opposed to corporate stewardship.
 
+> [iojs.org/faq.html](https://iojs.org/faq.html)
+
 ![logo](https://raw.githubusercontent.com/docker-library/docs/master/iojs/logo.png)
 
 # How to use this image
@@ -26,7 +29,7 @@ If you want to distribute your application on the docker registry, create a `Doc
 ```
 FROM iojs:onbuild
 
-# Expose the ports that your app uses. In Example:
+# Expose the ports that your app uses. For example:
 EXPOSE 8080
 ```
 

+ 3 - 2
iojs/content.md

@@ -1,5 +1,4 @@
 ## What is io.js?
-*from [iojs.org/faq.html](https://iojs.org/faq.html)*
 
 io.js is a JavaScript platform built on Chrome's V8 runtime. This project began as a fork of Joyent's Node.js™ and is compatible with the npm ecosystem.
 
@@ -7,6 +6,8 @@ Why? io.js aims to provide faster and predictable release cycles. It currently m
 
 This project aims to continue development of io.js under an "open governance model" as opposed to corporate stewardship.
 
+> [iojs.org/faq.html](https://iojs.org/faq.html)
+
 %%LOGO%%
 
 # How to use this image
@@ -16,7 +17,7 @@ If you want to distribute your application on the docker registry, create a `Doc
 ```
 FROM iojs:onbuild
 
-# Expose the ports that your app uses. In Example:
+# Expose the ports that your app uses. For example:
 EXPOSE 8080
 ```
 

+ 1 - 1
odoo/README.md

@@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`8.0`, `8`, `latest` (*8.0/Dockerfile*)](https://github.com/odoo/docker/blob/3a6e42c7a7698196dd42dc7c4b5782ab50885f89/8.0/Dockerfile)
+- [`8.0`, `8`, `latest` (*8.0/Dockerfile*)](https://github.com/odoo/docker/blob/a86b7e6dbc31d19b6180fdf00e56b4a0f5fe32ff/8.0/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 21 - 0
php/README.md

@@ -83,6 +83,27 @@ same commands to build and run:
 Where `src/` is the directory containing all your php code and `config/`
 contains your `php.ini` file.
 
+### How to install more PHP extensions
+
+We provide two convenient scripts named `docker-php-ext-configure` and `docker-php-ext-install`, you can use them to
+easily install PHP extension.
+
+For example, if you want to have a PHP-FPM image with `iconv`, `mcrypt` and `gd` 
+extensions, you can inheriting the base image that you like, and write your own 
+`Dockerfile` like this:
+
+    FROM php:5.5-fpm
+    # Install modules
+    RUN apt-get update && apt-get install -y \
+        libmcrypt-dev libpng12-dev libfreetype6-dev libjpeg62-turbo-dev \
+        && docker-php-ext-install iconv mcrypt \
+        && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-gd-dir=/usr/include/ \
+        && docker-php-ext-install gd
+    CMD ["php-fpm"]
+
+Remember, you must install dependencies for your extensions manually. If an extension needs custom `configure` arguments,
+you can use the `docker-php-ext-configure` script like this example.
+
 ### Without a `Dockerfile`
 
 If you don't want to include a `Dockerfile` in your project, it is sufficient to