Whitespace adjustments and run update.sh

This commit is contained in:
Joe Ferguson 2015-02-10 16:11:11 -08:00
parent 9c7a1c465d
commit d692597772
15 changed files with 126 additions and 112 deletions

View File

@ -10,8 +10,8 @@ repo](https://github.com/docker-library/official-images).
# What is irssi?
Irssi is a terminal based IRC client for UNIX systems. It also supports SILC
and ICB protocols via plugins. Some people refer to it as 'the client of the
Irssi is a terminal based IRC client for UNIX systems. It also supports SILC and
ICB protocols via plugins. Some people refer to it as 'the client of the
future'.
> [irssi.org](http://irssi.org)
@ -20,12 +20,10 @@ future'.
# How to use this image
Since no two users of irssi are likely to configure it exactly alike, this
image does not come with any default configuration.
Please refer to [upstream's excellent (and comprehensive)
documentation](http://irssi.org/documentation) on the subject of
configuring irssi for your needs.
Because it is unlikely any two irssi users have the same configuration
preferences, this image does not include an irssi configuration. To configure
irssi to your liking, please refer to [upstream's excellent (and comprehensive)
+documentation](http://irssi.org/documentation).
Be sure to also checkout the [awesome
scripts](https://github.com/irssi/scripts.irssi.org) you can download to
@ -33,14 +31,28 @@ customize your irssi configuration.
## Directly via bind mount
docker run -it --name my-running-irssi -e TERM \
-u $(id -u):$(id -g) -v $HOME/.irssi:/home/user/.irssi:ro \
On a Linux system, build and launch a container named `my-running-irssi` like
this:
docker run -it --name my-running-irssi -e TERM -u $(id -u):$(id -g) \
-v $HOME/.irssi:/home/user/.irssi:ro \
-v /etc/localtime:/etc/localtime:ro \
irssi
# in Docker 1.5 you can use the --read-only flag
docker run -it --name my-running-irssi -e TERM \
-u $(id -u):$(id -g) -v $HOME/.irssi:/home/user/.irssi --read-only \
On a Mac OS X system, run the same image using:
docker run -it --name my-running-irssi -e TERM -u $(id -u):$(id -g) \
-v $HOME/.irssi:/home/user/.irssi:ro \
irssi
You omit `/etc/localtime` on Mac OS X because `boot2docker` doesn't use this
file.
Of course, you can name your image anything you like. In Docker 1.5 you can also
use the `--read-only` mount flag. For example, on Linux:
docker run -it --name my-running-irssi -e TERM -u $(id -u):$(id -g) \
--read-only -v $HOME/.irssi:/home/user/.irssi \
-v /etc/localtime:/etc/localtime \
irssi
@ -75,4 +87,4 @@ Before you start to code, we recommend discussing your plans
through a [GitHub issue](https://github.com/jfrazelle/irssi/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.
else is working on the same thing.

View File

@ -1,5 +1,5 @@
# What is irssi?
Irssi is a terminal based IRC client for UNIX systems. It also supports SILC and
ICB protocols via plugins. Some people refer to it as 'the client of the
future'.
@ -19,20 +19,21 @@ Be sure to also checkout the [awesome
scripts](https://github.com/irssi/scripts.irssi.org) you can download to
customize your irssi configuration.
## Directly via bind mount
On a Linux system, build and launch a container named `my-running-irssi` like
this:
docker run -it --name my-running-irssi -e TERM \ -u $(id -u):$(id -g) -v
$HOME/.irssi:/home/user/.irssi:ro \ -v /etc/localtime:/etc/localtime:ro \
irssi
docker run -it --name my-running-irssi -e TERM -u $(id -u):$(id -g) \
-v $HOME/.irssi:/home/user/.irssi:ro \
-v /etc/localtime:/etc/localtime:ro \
irssi
On a Mac OS X system, run the same image using:
docker run -it --name my-running-irssi -e TERM -u $(id -u):$(id -g) \ -v
$HOME/.irssi:/home/user/.irssi:ro irssi
docker run -it --name my-running-irssi -e TERM -u $(id -u):$(id -g) \
-v $HOME/.irssi:/home/user/.irssi:ro \
irssi
You omit `/etc/localtime` on Mac OS X because `boot2docker` doesn't use this
file.
@ -40,6 +41,7 @@ file.
Of course, you can name your image anything you like. In Docker 1.5 you can also
use the `--read-only` mount flag. For example, on Linux:
docker run -it --name my-running-irssi -e TERM \ -u $(id -u):$(id -g) -v
$HOME/.irssi:/home/user/.irssi --read-only \ -v
/etc/localtime:/etc/localtime \ irssi
docker run -it --name my-running-irssi -e TERM -u $(id -u):$(id -g) \
--read-only -v $HOME/.irssi:/home/user/.irssi \
-v /etc/localtime:/etc/localtime \
irssi

View File

@ -93,7 +93,7 @@ jenkins_home) at any time.
If your volume is inside a container - you can use `docker cp
$ID:/var/jenkins_home` command to extract the data.
## Attaching build executors
## Attaching build executors
You can run builds on the master (out of the box) buf if you want to attach
build slave servers: make sure you map the port: `-p 50000:50000` - which will

View File

@ -34,7 +34,7 @@ jenkins_home) at any time.
If your volume is inside a container - you can use `docker cp
$ID:/var/jenkins_home` command to extract the data.
## Attaching build executors
## Attaching build executors
You can run builds on the master (out of the box) buf if you want to attach
build slave servers: make sure you map the port: `-p 50000:50000` - which will

View File

@ -10,14 +10,14 @@ repo](https://github.com/docker-library/official-images).
# What is Odoo?
Odoo, formerly known as OpenERP, is a suite of open-source business apps
written in Python and released under the AGPL license. This suite of
applications covers all business needs, from Website/Ecommerce down to
manufacturing, inventory and accounting, all seamlessly integrated. It is the
first time ever a software editor managed to reach such a functional coverage.
Odoo is the most installed business software in the world. Odoo is used by
2.000.000 users worldwide ranging from very small companies (1 user) to very
large ones (300 000 users).
Odoo, formerly known as OpenERP, is a suite of open-source business apps
written in Python and released under the AGPL license. This suite of
applications covers all business needs, from Website/Ecommerce down to
manufacturing, inventory and accounting, all seamlessly integrated. It is the
first time ever a software editor managed to reach such a functional coverage.
Odoo is the most installed business software in the world. Odoo is used by
2.000.000 users worldwide ranging from very small companies (1 user) to very
large ones (300 000 users).
> [www.odoo.com](https://www.odoo.com)
@ -25,28 +25,28 @@ large ones (300 000 users).
# How to use this image
This image requires a running PostgreSQL server.
This image requires a running PostgreSQL server.
## Start a PostgreSQL server
docker run -d -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo --name db postgres
docker run -d -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo --name db postgres
## Start an Odoo instance
docker run -p 127.0.0.1:8069:8069 --name odoo --link db:db -t odoo
docker run -p 127.0.0.1:8069:8069 --name odoo --link db:db -t odoo
The alias of the container running Postgres must be db for Odoo to be able
to connect to the Postgres server.
## Stop and restart an Odoo instance
docker stop odoo
docker start -a odoo
docker stop odoo
docker start -a odoo
## Stop and restart a PostgreSQL server
When a PostgreSQL server is restarted, the Odoo instances
linked to that server must be restarted as well because the server address has
changed and the link is thus broken.
When a PostgreSQL server is restarted, the Odoo instances
linked to that server must be restarted as well because the server address has
changed and the link is thus broken.
Restarting a PostgreSQL server does not affect the created databases.
@ -56,31 +56,31 @@ The default configuration file for the server (located at `/etc/odoo/openerp-ser
can be overriden at startup using volumes. Suppose you have a custom configuration
at `/path/to/config/openerp-server.conf`, then
docker run -v /path/to/config:/etc/odoo -p 127.0.0.1:8069:8069 --name odoo --link db:db -t odoo
docker run -v /path/to/config:/etc/odoo -p 127.0.0.1:8069:8069 --name odoo --link db:db -t odoo
## Run multiple Odoo instances
docker run -p 127.0.0.1:8070:8069 --name odoo2 --link db:db -t odoo
docker run -p 127.0.0.1:8071:8069 --name odoo3 --link db:db -t odoo
Please note that for plain use of mails and reports functionalities, when the
host and container ports differ (e.g. 8070 and 8069), one has to set,
in Odoo, Settings->Parameters->System Parameters (requires technical features),
docker run -p 127.0.0.1:8070:8069 --name odoo2 --link db:db -t odoo
docker run -p 127.0.0.1:8071:8069 --name odoo3 --link db:db -t odoo
Please note that for plain use of mails and reports functionalities, when the
host and container ports differ (e.g. 8070 and 8069), one has to set,
in Odoo, Settings->Parameters->System Parameters (requires technical features),
web.base.url to the container port (e.g. 127.0.0.1:8069).
# How to upgrade this image
Suppose you created a database from an Odoo instance named old-odoo, and you
want to access this database from a new Odoo instance named new-odoo, e.g.
Suppose you created a database from an Odoo instance named old-odoo, and you
want to access this database from a new Odoo instance named new-odoo, e.g.
because you've just downloaded a newer Odoo image.
By default, Odoo 8.0 uses a filestore (located at /var/lib/odoo/.local/share/Odoo/filestore/)
By default, Odoo 8.0 uses a filestore (located at /var/lib/odoo/.local/share/Odoo/filestore/)
for attachments. You should restore this filestore in your new Odoo instance by
running
docker run --volumes-from old-odoo -p 127.0.0.1:8070:8069 --name new-odoo --link db:db -t odoo
docker run --volumes-from old-odoo -p 127.0.0.1:8070:8069 --name new-odoo --link db:db -t odoo
You can also simply prevent Odoo from using the filestore by setting the system
parameter `ir_attachment.location` to `db-storage` in Settings->Parameters->System
parameter `ir_attachment.location` to `db-storage` in Settings->Parameters->System
Parameters (requires technical features).
# License

View File

@ -1,13 +1,13 @@
# What is Odoo?
Odoo, formerly known as OpenERP, is a suite of open-source business apps
written in Python and released under the AGPL license. This suite of
applications covers all business needs, from Website/Ecommerce down to
manufacturing, inventory and accounting, all seamlessly integrated. It is the
first time ever a software editor managed to reach such a functional coverage.
Odoo is the most installed business software in the world. Odoo is used by
2.000.000 users worldwide ranging from very small companies (1 user) to very
large ones (300 000 users).
Odoo, formerly known as OpenERP, is a suite of open-source business apps
written in Python and released under the AGPL license. This suite of
applications covers all business needs, from Website/Ecommerce down to
manufacturing, inventory and accounting, all seamlessly integrated. It is the
first time ever a software editor managed to reach such a functional coverage.
Odoo is the most installed business software in the world. Odoo is used by
2.000.000 users worldwide ranging from very small companies (1 user) to very
large ones (300 000 users).
> [www.odoo.com](https://www.odoo.com)
@ -15,28 +15,28 @@ large ones (300 000 users).
# How to use this image
This image requires a running PostgreSQL server.
This image requires a running PostgreSQL server.
## Start a PostgreSQL server
docker run -d -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo --name db postgres
docker run -d -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo --name db postgres
## Start an Odoo instance
docker run -p 127.0.0.1:8069:8069 --name odoo --link db:db -t odoo
docker run -p 127.0.0.1:8069:8069 --name odoo --link db:db -t odoo
The alias of the container running Postgres must be db for Odoo to be able
to connect to the Postgres server.
## Stop and restart an Odoo instance
docker stop odoo
docker start -a odoo
docker stop odoo
docker start -a odoo
## Stop and restart a PostgreSQL server
When a PostgreSQL server is restarted, the Odoo instances
linked to that server must be restarted as well because the server address has
changed and the link is thus broken.
When a PostgreSQL server is restarted, the Odoo instances
linked to that server must be restarted as well because the server address has
changed and the link is thus broken.
Restarting a PostgreSQL server does not affect the created databases.
@ -46,29 +46,29 @@ The default configuration file for the server (located at `/etc/odoo/openerp-ser
can be overriden at startup using volumes. Suppose you have a custom configuration
at `/path/to/config/openerp-server.conf`, then
docker run -v /path/to/config:/etc/odoo -p 127.0.0.1:8069:8069 --name odoo --link db:db -t odoo
docker run -v /path/to/config:/etc/odoo -p 127.0.0.1:8069:8069 --name odoo --link db:db -t odoo
## Run multiple Odoo instances
docker run -p 127.0.0.1:8070:8069 --name odoo2 --link db:db -t odoo
docker run -p 127.0.0.1:8071:8069 --name odoo3 --link db:db -t odoo
Please note that for plain use of mails and reports functionalities, when the
host and container ports differ (e.g. 8070 and 8069), one has to set,
in Odoo, Settings->Parameters->System Parameters (requires technical features),
docker run -p 127.0.0.1:8070:8069 --name odoo2 --link db:db -t odoo
docker run -p 127.0.0.1:8071:8069 --name odoo3 --link db:db -t odoo
Please note that for plain use of mails and reports functionalities, when the
host and container ports differ (e.g. 8070 and 8069), one has to set,
in Odoo, Settings->Parameters->System Parameters (requires technical features),
web.base.url to the container port (e.g. 127.0.0.1:8069).
# How to upgrade this image
Suppose you created a database from an Odoo instance named old-odoo, and you
want to access this database from a new Odoo instance named new-odoo, e.g.
Suppose you created a database from an Odoo instance named old-odoo, and you
want to access this database from a new Odoo instance named new-odoo, e.g.
because you've just downloaded a newer Odoo image.
By default, Odoo 8.0 uses a filestore (located at /var/lib/odoo/.local/share/Odoo/filestore/)
By default, Odoo 8.0 uses a filestore (located at /var/lib/odoo/.local/share/Odoo/filestore/)
for attachments. You should restore this filestore in your new Odoo instance by
running
docker run --volumes-from old-odoo -p 127.0.0.1:8070:8069 --name new-odoo --link db:db -t odoo
docker run --volumes-from old-odoo -p 127.0.0.1:8070:8069 --name new-odoo --link db:db -t odoo
You can also simply prevent Odoo from using the filestore by setting the system
parameter `ir_attachment.location` to `db-storage` in Settings->Parameters->System
parameter `ir_attachment.location` to `db-storage` in Settings->Parameters->System
Parameters (requires technical features).

View File

@ -14,16 +14,16 @@ repo](https://github.com/docker-library/official-images).
![logo](https://raw.githubusercontent.com/docker-library/docs/master/oraclelinux/logo.png)
Oracle Linux is an open-source operating system available under the GNU General
Public License (GPLv2). Suitable for general purpose or Oracle workloads, it
Public License (GPLv2). Suitable for general purpose or Oracle workloads, it
benefits from rigorous testing of more than 128,000 hours per day with real-
world workloads and includes unique innovations such as Ksplice for zero-
downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs
downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs
file system, and more.
## How to use these images
The Oracle Linux images are intended for use in the **FROM** field of an
application's `Dockerfile`. For example, to use Oracle Linux 6 as the
The Oracle Linux images are intended for use in the **FROM** field of an
application's `Dockerfile`. For example, to use Oracle Linux 6 as the
base of an image, specify `FROM oraclelinux:6`.
## Official Resources
@ -54,15 +54,15 @@ Support for older versions (down to 1.0) is provided on a best-effort basis.
## Customer Support
Oracle provides support to Oracle Linux subscription customers via the
[My Oracle Support] (https://support.oracle.com) portal. The Oracle Linux
Docker images are covered by Oracle Linux Basic and Premier support
subscriptions. Customers should follow existing support procedures to obtain
Oracle provides support to Oracle Linux subscription customers via the
[My Oracle Support] (https://support.oracle.com) portal. The Oracle Linux
Docker images are covered by Oracle Linux Basic and Premier support
subscriptions. Customers should follow existing support procedures to obtain
support for Oracle Linux running in a Docker container.
## Community Support
For Oracle Linux users without a paid support subscription, the following resources
For Oracle Linux users without a paid support subscription, the following resources
are available:
* The [Oracle Linux Forum] (https://community.oracle.com/community/server_%26_storage_systems/linux/oracle_linux) on the [Oracle Technology Network Community] (https://community.oracle.com/welcome).
@ -75,5 +75,5 @@ existing support procedures to suggest new features, fixes or updates to the
Oracle Linux Docker images.
For Oracle Linux users without a paid support subscription, please submit
any new feature, fix or update suggestion via a
any new feature, fix or update suggestion via a
[GitHub issue](https://github.com/oracle/docker-images/issues).

View File

@ -3,16 +3,16 @@
%%LOGO%%
Oracle Linux is an open-source operating system available under the GNU General
Public License (GPLv2). Suitable for general purpose or Oracle workloads, it
Public License (GPLv2). Suitable for general purpose or Oracle workloads, it
benefits from rigorous testing of more than 128,000 hours per day with real-
world workloads and includes unique innovations such as Ksplice for zero-
downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs
downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs
file system, and more.
## How to use these images
The Oracle Linux images are intended for use in the **FROM** field of an
application's `Dockerfile`. For example, to use Oracle Linux 6 as the
The Oracle Linux images are intended for use in the **FROM** field of an
application's `Dockerfile`. For example, to use Oracle Linux 6 as the
base of an image, specify `FROM oraclelinux:6`.
## Official Resources

View File

@ -1,14 +1,14 @@
## Customer Support
Oracle provides support to Oracle Linux subscription customers via the
[My Oracle Support] (https://support.oracle.com) portal. The Oracle Linux
Docker images are covered by Oracle Linux Basic and Premier support
subscriptions. Customers should follow existing support procedures to obtain
Oracle provides support to Oracle Linux subscription customers via the
[My Oracle Support] (https://support.oracle.com) portal. The Oracle Linux
Docker images are covered by Oracle Linux Basic and Premier support
subscriptions. Customers should follow existing support procedures to obtain
support for Oracle Linux running in a Docker container.
## Community Support
For Oracle Linux users without a paid support subscription, the following resources
For Oracle Linux users without a paid support subscription, the following resources
are available:
* The [Oracle Linux Forum] (https://community.oracle.com/community/server_%26_storage_systems/linux/oracle_linux) on the [Oracle Technology Network Community] (https://community.oracle.com/welcome).
@ -21,5 +21,5 @@ existing support procedures to suggest new features, fixes or updates to the
Oracle Linux Docker images.
For Oracle Linux users without a paid support subscription, please submit
any new feature, fix or update suggestion via a
any new feature, fix or update suggestion via a
[GitHub issue](%%GITHUB-REPO%%/issues).

View File

@ -12,7 +12,7 @@ repo](https://github.com/docker-library/official-images).
What is Zend Server?
==================
Zend Server is the integrated application platform for PHP mobile and web apps.
Zend Server is the integrated application platform for PHP mobile and web apps.
Zend Server provides you with a highly available PHP production environment which includes, amongst other features, a highly reliable PHP stack, application monitoring, troubleshooting, and the all-new Z-Ray.
###Boost your Development with Z-Ray
Using Zend Server Z-Ray is akin to wearing X-Ray goggles, effortlessly giving developers deep insight into how their code is running as they are developing it all without having to change any of their habits or workflow. With Z-Ray, developers can immediately understand the impact of their code changes, enabling them to both improve quality and solve issues long before their code reaches production. In addition to the obvious benefits of this Left Shifting better performance, fewer production issues and faster recovery times using Z-Ray is also downright fun!

View File

@ -1,7 +1,7 @@
What is Zend Server?
==================
Zend Server is the integrated application platform for PHP mobile and web apps.
Zend Server is the integrated application platform for PHP mobile and web apps.
Zend Server provides you with a highly available PHP production environment which includes, amongst other features, a highly reliable PHP stack, application monitoring, troubleshooting, and the all-new Z-Ray.
###Boost your Development with Z-Ray
Using Zend Server Z-Ray is akin to wearing X-Ray goggles, effortlessly giving developers deep insight into how their code is running as they are developing it all without having to change any of their habits or workflow. With Z-Ray, developers can immediately understand the impact of their code changes, enabling them to both improve quality and solve issues long before their code reaches production. In addition to the obvious benefits of this Left Shifting better performance, fewer production issues and faster recovery times using Z-Ray is also downright fun!

View File

@ -88,8 +88,8 @@ contains your `php.ini` file.
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
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

View File

@ -70,8 +70,8 @@ contains your `php.ini` file.
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
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

View File

@ -8,7 +8,7 @@ manifest file
in the [`docker-library/official-images` GitHub
repo](https://github.com/docker-library/official-images).
# Overview
# Overview
This image contains IBM WebSphere Application Server for Developers Liberty
Profile and the IBM Java Runtime Environment. For more information on WebSphere

View File

@ -1,4 +1,4 @@
# Overview
# Overview
This image contains IBM WebSphere Application Server for Developers Liberty
Profile and the IBM Java Runtime Environment. For more information on WebSphere