Skip to content

Commit

Permalink
Run update.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
docker-library-bot committed Oct 9, 2017
1 parent 94cdbe9 commit 6b394db
Show file tree
Hide file tree
Showing 15 changed files with 85 additions and 61 deletions.
4 changes: 2 additions & 2 deletions adminer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Then you can hit `http://localhost:8080` or `http://host-ip:8080` in your browse

### FastCGI

If you are already running a FastCGI capable web server you might prefer running adminer via FastCGI:
If you are already running a FastCGI capable web server you might prefer running Adminer via FastCGI:

```console
$ docker run --link some_database:db -p 9000:9000 adminer:fastcgi
Expand Down Expand Up @@ -109,7 +109,7 @@ Run `docker stack deploy -c stack.yml adminer` (or `docker-compose -f stack.yml

### Loading plugins

This image bundles all official adminer plugins. You can find the list of plugins on GitHub: https://github.com/vrana/adminer/tree/master/plugins.
This image bundles all official Adminer plugins. You can find the list of plugins on GitHub: https://github.com/vrana/adminer/tree/master/plugins.

To load plugins you can pass a list of filenames in `ADMINER_PLUGINS`:

Expand Down
8 changes: 4 additions & 4 deletions aerospike/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Documentation for Aerospike is available at [http://aerospike.com/docs](https://
The following will run `asd` with all the exposed ports forwarded to the host machine.

```console
$ docker run -d --name aerospike -p 3000:3000 -p 3001:3001 -p 3002:3002 -p 3003:3003 aerospike/aerospike-server
$ docker run -d --name aerospike -p 3000:3000 -p 3001:3001 -p 3002:3002 -p 3003:3003 aerospike
```

**NOTE** Although this is the simplest method to getting Aerospike up and running, but it is not the preferred method. To properly run the container, please specify a **custom configuration** with the **access-address** defined.
Expand All @@ -72,7 +72,7 @@ By default, `asd` will use the configuration file at `/etc/aerospike/aerospike.c

-v <DIRECTORY>:/opt/aerospike/etc

Where `<DIRECTORY>` is the path to a directory containing your custom aerospike.conf file. Next, you will want to tell `asd` to use the configuration file that was just mounted by using the `--config-file` option for `aerospike/aerospike-server`:
Where `<DIRECTORY>` is the path to a directory containing your custom aerospike.conf file. Next, you will want to tell `asd` to use the configuration file that was just mounted by using the `--config-file` option for `aerospike`:

--config-file /opt/aerospike/etc/aerospike.conf

Expand All @@ -81,7 +81,7 @@ This will tell `asd` to use the config file at `/opt/aerospike/etc/aerospike.con
A full example:

```console
$ docker run -d -v <DIRECTORY>:/opt/aerospike/etc --name aerospike -p 3000:3000 -p 3001:3001 -p 3002:3002 -p 3003:3003 aerospike/aerospike-server asd --foreground --config-file /opt/aerospike/etc/aerospike.conf
$ docker run -d -v <DIRECTORY>:/opt/aerospike/etc --name aerospike -p 3000:3000 -p 3001:3001 -p 3002:3002 -p 3003:3003 aerospike asd --foreground --config-file /opt/aerospike/etc/aerospike.conf
```

### access-address Configuration
Expand Down Expand Up @@ -109,7 +109,7 @@ Where `<DIRECTORY>` is the path to a directory containing your data files.
A full example:

```console
$ docker run -d -v <DIRECTORY>:/opt/aerospike/data --name aerospike -p 3000:3000 -p 3001:3001 -p 3002:3002 -p 3003:3003 aerospike/aerospike-server
$ docker run -d -v <DIRECTORY>:/opt/aerospike/data --name aerospike -p 3000:3000 -p 3001:3001 -p 3002:3002 -p 3003:3003 aerospike
```

## Clustering
Expand Down
1 change: 1 addition & 0 deletions drupal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ $ docker run --name some-drupal --link some-postgres:postgres -d \
-v drupal-profiles:/var/www/html/profiles \
-v drupal-sites:/var/www/html/sites \
-v drupal-themes:/var/www/html/themes \
drupal
```

## ... via [`docker stack deploy`](https://docs.docker.com/engine/reference/commandline/stack_deploy/) or [`docker-compose`](https://github.com/docker/compose)
Expand Down
20 changes: 10 additions & 10 deletions gazebo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ WARNING:

# Supported tags and respective `Dockerfile` links

- [`gzserver4` (*gazebo/gazebo4/gzserver4/Dockerfile*)](https://github.com/osrf/docker_images/blob/113c7241bac8ca94c238b1a5bf5ce71ee2a7f219/gazebo/gazebo4/gzserver4/Dockerfile)
- [`libgazebo4` (*gazebo/gazebo4/libgazebo4/Dockerfile*)](https://github.com/osrf/docker_images/blob/113c7241bac8ca94c238b1a5bf5ce71ee2a7f219/gazebo/gazebo4/libgazebo4/Dockerfile)
- [`gzserver5` (*gazebo/gazebo5/gzserver5/Dockerfile*)](https://github.com/osrf/docker_images/blob/113c7241bac8ca94c238b1a5bf5ce71ee2a7f219/gazebo/gazebo5/gzserver5/Dockerfile)
- [`libgazebo5` (*gazebo/gazebo5/libgazebo5/Dockerfile*)](https://github.com/osrf/docker_images/blob/113c7241bac8ca94c238b1a5bf5ce71ee2a7f219/gazebo/gazebo5/libgazebo5/Dockerfile)
- [`gzserver6` (*gazebo/gazebo6/gzserver6/Dockerfile*)](https://github.com/osrf/docker_images/blob/113c7241bac8ca94c238b1a5bf5ce71ee2a7f219/gazebo/gazebo6/gzserver6/Dockerfile)
- [`libgazebo6` (*gazebo/gazebo6/libgazebo6/Dockerfile*)](https://github.com/osrf/docker_images/blob/113c7241bac8ca94c238b1a5bf5ce71ee2a7f219/gazebo/gazebo6/libgazebo6/Dockerfile)
- [`gzserver7` (*gazebo/gazebo7/gzserver7/Dockerfile*)](https://github.com/osrf/docker_images/blob/113c7241bac8ca94c238b1a5bf5ce71ee2a7f219/gazebo/gazebo7/gzserver7/Dockerfile)
- [`libgazebo7` (*gazebo/gazebo7/libgazebo7/Dockerfile*)](https://github.com/osrf/docker_images/blob/113c7241bac8ca94c238b1a5bf5ce71ee2a7f219/gazebo/gazebo7/libgazebo7/Dockerfile)
- [`gzserver8` (*gazebo/gazebo8/gzserver8/Dockerfile*)](https://github.com/osrf/docker_images/blob/113c7241bac8ca94c238b1a5bf5ce71ee2a7f219/gazebo/gazebo8/gzserver8/Dockerfile)
- [`libgazebo8`, `latest` (*gazebo/gazebo8/libgazebo8/Dockerfile*)](https://github.com/osrf/docker_images/blob/113c7241bac8ca94c238b1a5bf5ce71ee2a7f219/gazebo/gazebo8/libgazebo8/Dockerfile)
- [`gzserver4` (*gazebo/4/ubuntu/trusty/gzserver4/Dockerfile*)](https://github.com/osrf/docker_images/blob/1154349c9f81a11ce50d73fd2e07020f4eb7c0b9/gazebo/4/ubuntu/trusty/gzserver4/Dockerfile)
- [`libgazebo4` (*gazebo/4/ubuntu/trusty/libgazebo4/Dockerfile*)](https://github.com/osrf/docker_images/blob/1154349c9f81a11ce50d73fd2e07020f4eb7c0b9/gazebo/4/ubuntu/trusty/libgazebo4/Dockerfile)
- [`gzserver5` (*gazebo/5/ubuntu/trusty/gzserver5/Dockerfile*)](https://github.com/osrf/docker_images/blob/1154349c9f81a11ce50d73fd2e07020f4eb7c0b9/gazebo/5/ubuntu/trusty/gzserver5/Dockerfile)
- [`libgazebo5` (*gazebo/5/ubuntu/trusty/libgazebo5/Dockerfile*)](https://github.com/osrf/docker_images/blob/1154349c9f81a11ce50d73fd2e07020f4eb7c0b9/gazebo/5/ubuntu/trusty/libgazebo5/Dockerfile)
- [`gzserver6` (*gazebo/6/ubuntu/trusty/gzserver6/Dockerfile*)](https://github.com/osrf/docker_images/blob/1154349c9f81a11ce50d73fd2e07020f4eb7c0b9/gazebo/6/ubuntu/trusty/gzserver6/Dockerfile)
- [`libgazebo6` (*gazebo/6/ubuntu/trusty/libgazebo6/Dockerfile*)](https://github.com/osrf/docker_images/blob/1154349c9f81a11ce50d73fd2e07020f4eb7c0b9/gazebo/6/ubuntu/trusty/libgazebo6/Dockerfile)
- [`gzserver7` (*gazebo/7/ubuntu/xenial/gzserver7/Dockerfile*)](https://github.com/osrf/docker_images/blob/72c476d68274d62762ffdd553bf57d8ae6a92d07/gazebo/7/ubuntu/xenial/gzserver7/Dockerfile)
- [`libgazebo7` (*gazebo/7/ubuntu/xenial/libgazebo7/Dockerfile*)](https://github.com/osrf/docker_images/blob/72c476d68274d62762ffdd553bf57d8ae6a92d07/gazebo/7/ubuntu/xenial/libgazebo7/Dockerfile)
- [`gzserver8` (*gazebo/8/ubuntu/xenial/gzserver8/Dockerfile*)](https://github.com/osrf/docker_images/blob/1154349c9f81a11ce50d73fd2e07020f4eb7c0b9/gazebo/8/ubuntu/xenial/gzserver8/Dockerfile)
- [`libgazebo8`, `latest` (*gazebo/8/ubuntu/xenial/libgazebo8/Dockerfile*)](https://github.com/osrf/docker_images/blob/1154349c9f81a11ce50d73fd2e07020f4eb7c0b9/gazebo/8/ubuntu/xenial/libgazebo8/Dockerfile)

# Quick reference

Expand Down
2 changes: 1 addition & 1 deletion gradle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Note that if you are mounting a volume and the uid running Docker is not `1000`,

Run this from the directory of the Gradle project you want to build.

`docker run --rm -v "$PWD":/home/gradle/project -w /home/gradle/project gradle:latest gradle <gradle-task>`
`docker run --rm -v "$PWD":/home/gradle/project -w /home/gradle/project gradle gradle <gradle-task>`

**Note: Java 9 support is experimental**

Expand Down
2 changes: 1 addition & 1 deletion kaazing-gateway/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ By default the gateway runs a WebSocket echo service similar to [websocket.org](
You must give your gateway container a hostname. To do this, use the `docker run -h somehostname` option, along with the -e option to define an environment variable, GATEWAY_OPTS, to pass this hostname to the gateway configuration (your hostname may vary):

```console
$ docker run --name some-kaazing-gateway -h somehostname -e GATEWAY_OPTS="-Dgateway.hostname=somehostname -Xmx512m -Djava.security.egd=file:/dev/urandom"-d -p 8000:8000 kaazing-gateway
$ docker run --name some-kaazing-gateway -h somehostname -e GATEWAY_OPTS="-Dgateway.hostname=somehostname -Xmx512m -Djava.security.egd=file:/dev/urandom" -d -p 8000:8000 kaazing-gateway
```

Note: the additional GATEWAY_OPTS options, `-Xmx512m -Djava.security.egd=file:/dev/urandom`, are added in order to preserve these values from the original Dockerfile for the gateway. The `-Xmx512m` value specifies a minimum Java heap size of 512 MB, and `-Djava.security.egd=file:/dev/urandom` is to facilitate faster startup on VMs. See the `Dockerfile` link referenced above for details.
Expand Down
2 changes: 1 addition & 1 deletion kong/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ docker run --rm \
-e "KONG_DATABASE=postgres" \
-e "KONG_PG_HOST=kong-database" \
-e "KONG_CASSANDRA_CONTACT_POINTS=kong-database" \
kong:latest kong migrations up
kong kong migrations up
```

In the above example, both Cassandra and PostgreSQL are configured, but you should update the `KONG_DATABASE` environment variable with either `cassandra` or `postgres`.
Expand Down
6 changes: 3 additions & 3 deletions mariadb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ $ docker run --name some-app --link some-mariadb:mysql -d application-that-uses-

## Connect to MariaDB from the MySQL command line client

The following command starts another mariadb container instance and runs the `mysql` command line client against your original mariadb container, allowing you to execute SQL statements against your database instance:
The following command starts another `mariadb` container instance and runs the `mysql` command line client against your original `mariadb` container, allowing you to execute SQL statements against your database instance:

```console
$ docker run -it --link some-mariadb:mysql --rm mariadb sh -c 'exec mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD"'
```

... where `some-mariadb` is the name of your original mariadb container.
... where `some-mariadb` is the name of your original `mariadb` container.

This image can also be used as a client for non-Docker or remote MariaDB instances:

Expand Down Expand Up @@ -211,7 +211,7 @@ Currently, this is only supported for `MYSQL_ROOT_PASSWORD`, `MYSQL_ROOT_HOST`,

# Initializing a fresh instance

When a container is started for the first time, a new database with the specified name will be created and initialized with the provided configuration variables. Furthermore, it will execute files with extensions `.sh`, `.sql` and `.sql.gz` that are found in `/docker-entrypoint-initdb.d`. Files will be executed in alphabetical order. You can easily populate your mariadb services by [mounting a SQL dump into that directory](https://docs.docker.com/engine/tutorials/dockervolumes/#mount-a-host-file-as-a-data-volume) and provide [custom images](https://docs.docker.com/reference/builder/) with contributed data. SQL files will be imported by default to the database specified by the `MYSQL_DATABASE` variable.
When a container is started for the first time, a new database with the specified name will be created and initialized with the provided configuration variables. Furthermore, it will execute files with extensions `.sh`, `.sql` and `.sql.gz` that are found in `/docker-entrypoint-initdb.d`. Files will be executed in alphabetical order. You can easily populate your `mariadb` services by [mounting a SQL dump into that directory](https://docs.docker.com/engine/tutorials/dockervolumes/#mount-a-host-file-as-a-data-volume) and provide [custom images](https://docs.docker.com/reference/builder/) with contributed data. SQL files will be imported by default to the database specified by the `MYSQL_DATABASE` variable.

# Caveats

Expand Down
6 changes: 3 additions & 3 deletions mysql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ $ docker run --name some-app --link some-mysql:mysql -d application-that-uses-my

## Connect to MySQL from the MySQL command line client

The following command starts another mysql container instance and runs the `mysql` command line client against your original mysql container, allowing you to execute SQL statements against your database instance:
The following command starts another `mysql` container instance and runs the `mysql` command line client against your original `mysql` container, allowing you to execute SQL statements against your database instance:

```console
$ docker run -it --link some-mysql:mysql --rm mysql sh -c 'exec mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD"'
```

... where `some-mysql` is the name of your original mysql container.
... where `some-mysql` is the name of your original `mysql` container.

This image can also be used as a client for non-Docker or remote MySQL instances:

Expand Down Expand Up @@ -210,7 +210,7 @@ Currently, this is only supported for `MYSQL_ROOT_PASSWORD`, `MYSQL_ROOT_HOST`,

# Initializing a fresh instance

When a container is started for the first time, a new database with the specified name will be created and initialized with the provided configuration variables. Furthermore, it will execute files with extensions `.sh`, `.sql` and `.sql.gz` that are found in `/docker-entrypoint-initdb.d`. Files will be executed in alphabetical order. You can easily populate your mysql services by [mounting a SQL dump into that directory](https://docs.docker.com/engine/tutorials/dockervolumes/#mount-a-host-file-as-a-data-volume) and provide [custom images](https://docs.docker.com/reference/builder/) with contributed data. SQL files will be imported by default to the database specified by the `MYSQL_DATABASE` variable.
When a container is started for the first time, a new database with the specified name will be created and initialized with the provided configuration variables. Furthermore, it will execute files with extensions `.sh`, `.sql` and `.sql.gz` that are found in `/docker-entrypoint-initdb.d`. Files will be executed in alphabetical order. You can easily populate your `mysql` services by [mounting a SQL dump into that directory](https://docs.docker.com/engine/tutorials/dockervolumes/#mount-a-host-file-as-a-data-volume) and provide [custom images](https://docs.docker.com/reference/builder/) with contributed data. SQL files will be imported by default to the database specified by the `MYSQL_DATABASE` variable.

# Caveats

Expand Down
2 changes: 1 addition & 1 deletion neurodebian/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ The `neurodebian:latest` tag will always point the Neurodebian-enabled latest st
NeuroDebian APT file is installed under `/etc/apt/sources.list.d/neurodebian.sources.list` and currently enables only `main` (DFSG-compliant) area of the archive:

```console
$ docker run neurodebian:latest cat /etc/apt/sources.list.d/neurodebian.sources.list
$ docker run neurodebian cat /etc/apt/sources.list.d/neurodebian.sources.list
deb http://neuro.debian.net/debian wheezy main
deb http://neuro.debian.net/debian data main
#deb-src http://neuro.debian.net/debian-devel wheezy main
Expand Down
79 changes: 49 additions & 30 deletions nextcloud/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,24 @@ To make your data persistent to upgrading and get access for backups is using na

Nextcloud:

- `/var/www/html/` folder where all nextcloud data lives`console
$ docker run -d nextcloud \
-v nextcloud:/var/www/html
`
- `/var/www/html/` folder where all Nextcloud data lives

```console
$ docker run -d \
-v nextcloud:/var/www/html \
nextcloud
```

Database:

- `/var/lib/mysql` MySQL / MariaDB Data
- `/var/lib/postresql/data` PostegreSQL Data`console
$ docker run -d mariadb \
-v db:/var/lib/mysql
`
- `/var/lib/postresql/data` PostegreSQL Data

```console
$ docker run -d \
-v db:/var/lib/mysql \
mariadb
```

If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps. The `data`, `config` are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.

Expand All @@ -123,12 +129,13 @@ Overview of the folders that can be mounted as volumes:
If you want to use named volumes for all of these it would look like this

```console
$ docker run -d nextcloud \
-v nextcloud:/var/www/html \
-v apps:/var/www/html/custom_apps \
-v config:/var/www/html/config \
-v data:/var/www/html/data \
-v theme:/var/www/html/themes/<YOUR_CUSTOM_THEME>
$ docker run -d \
-v nextcloud:/var/www/html \
-v apps:/var/www/html/custom_apps \
-v config:/var/www/html/config \
-v data:/var/www/html/data \
-v theme:/var/www/html/themes/<YOUR_CUSTOM_THEME> \
nextcloud
```

## Using the Nextcloud command-line interface
Expand Down Expand Up @@ -208,7 +215,7 @@ services:
- MYSQL_DATABASE=nextcloud
- MYSQL_USER=nextcloud

app:
app:
image: nextcloud
ports:
- 8080:80
Expand All @@ -217,7 +224,6 @@ services:
volumes:
- nextcloud:/var/www/html
restart: always

```
Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
Expand Down Expand Up @@ -338,7 +344,7 @@ If you use your own Dockerfile you need to configure your docker-compose file ac
**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:

```console
docker build -t your-name --pull .
docker build -t your-name --pull .
docker run -d your-name
```

Expand All @@ -356,26 +362,39 @@ The `--pull` option tells docker to look for new versions of the base image. The
You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:

1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)`console
2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)

```console
docker cp ./database.dmp nextcloud_db_1:/dmp
docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
docker-compose exec db rm /dmp
`
```

3. Edit your config.php

1. Set database connection`php
1. Set database connection

```php
'dbhost' => 'db:3306',
`
2. Make sure you have no configuration for the `apps_paths`. Delete lines like these\`\``diff
3. "apps_paths" => array (
4. 0 => array (
5. "path" => OC::$SERVERROOT."/apps",
6. "url" => "/apps",
7. "writable" => true,
8. ),\`\`\`
9. Make sure your data directory is set to /var/www/html/data`php
```

2. Make sure you have no configuration for the `apps_paths`. Delete lines like these

```php
"apps_paths" => array (
0 => array (
"path" => OC::$SERVERROOT."/apps",
"url" => "/apps",
"writable" => true,
),
),
```

3. Make sure your data directory is set to /var/www/html/data

```php
'datadirectory' => '/var/www/html/data',
`
```

4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):

Expand Down
Loading

0 comments on commit 6b394db

Please sign in to comment.