Whitespace adjustments and run update.sh
This commit is contained in:
Joe Ferguson
parent
9c7a1c465d
commit
d692597772
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -29,19 +29,19 @@ 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
|
||||
|
|
@ -56,12 +56,12 @@ 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
|
||||
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,
|
||||
|
|
@ -77,7 +77,7 @@ By default, Odoo 8.0 uses a filestore (located at /var/lib/odoo/.local/share/Odo
|
|||
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
|
||||
|
|
|
|||
|
|
@ -19,19 +19,19 @@ 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
|
||||
|
|
@ -46,12 +46,12 @@ 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
|
||||
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,
|
||||
|
|
@ -67,7 +67,7 @@ By default, Odoo 8.0 uses a filestore (located at /var/lib/odoo/.local/share/Odo
|
|||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue