diff options
Diffstat (limited to 'docker/README.md')
| -rw-r--r-- | docker/README.md | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/docker/README.md b/docker/README.md index 9f82cf7626..2ef372711f 100644 --- a/docker/README.md +++ b/docker/README.md @@ -3,13 +3,13 @@ Docker TOOLS ARE WRITTEN FOR TESTING AND TO SEE WHAT IT IS! -For this to work you will need the nifty docker tool [fig]. +For this to work you will need the nifty docker tool [docker-compose]. The most simple setup will look like this: ```sh ./assemble_blocks.sh docker_gogs w_db option_db_mysql -fig up +docker-compose up ``` @@ -22,21 +22,21 @@ How does it work ---------------- `./assemble_blocks.sh` will look in `blocks` for subdirectories. -In the subdirectories there are three relevant files: `Dockerfile`, `config` and `fig`. +In the subdirectories there are three relevant files: `Dockerfile`, `config` and `docker-compose`. `Dockerfile` will be copied to `docker/` (also means last `Dockerfile` wins). The `config` file contains lines which will in the gogs docker container end up in `$GOGS_PATH/custom/config/app.ini` and by this gogs will be configured. Here you can define things like the MySQL server for your database block. -The `fig` file will just be added to `fig.yml`, which is used by fig to manage your containers. +The `docker-compose` file will just be added to `docker-compose.yml`, which is used by docker-compose to manage your containers. This includes container linking! Just have a look at them and it will be clear how to write your own blocks. Just some things - - all files (`Dockerfile`, `fig` and `config`) are optional + - all files (`Dockerfile`, `docker-compose` and `config`) are optional - the gogs block should always be the first block Currently the blocks are designed that, the blocks that start with `docker` pull in the base docker image. @@ -57,14 +57,11 @@ Here is a more elaborated example ```sh ./assemble_blocks.sh docker_gogs w_db_cache_session option_db_postgresql option_cache_redis option_session_mysql -fig up +docker-compose up ``` This will set up four containters and link them proberly. One for each of - - - gogs - - database (postgresql) - - cache (redis) +docker-compose - session (mysql) WARNING: This will not work at the Moment! MySQL session is broken! @@ -73,7 +70,7 @@ WARNING: This will not work at the Moment! MySQL session is broken! Remark ------ -After you execute `assemble_blocks.sh` you should always trigger `fig build` to inculde the the new init script `init_gogs.sh` in the docker image. +After you execute `assemble_blocks.sh` you should always trigger `docker-compose build` to inculde the the new init script `init_gogs.sh` in the docker image. If you want to use another GoGS docker file, but keep everything else the same, you can create a block, e.g. `docker_gogs_custom`, with only a `Dockerfile` and call @@ -86,4 +83,4 @@ This will pull in the `Dockerfile` from `docker_gogs` instead of the one from `d `Dockerfile`s for the `master` and `dev` branch are provided as `docker_gogs` and `docker_gogs_dev` -[fig]:http://www.fig.sh/ +[docker-compose]:https://docs.docker.com/compose/ |