diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-12-27 12:38:18 +0800 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-12-27 12:38:18 +0800 |
| commit | 6a6636d4513b93555dd476e6d1883663e036e606 (patch) | |
| tree | c03bec7dc676a44b4d64eefd687b64223175da60 | |
| parent | c0cfd62b9007122f78f28f4dbbe3c3eeeee5b02b (diff) | |
| parent | 46742a79cacb3db50e95907a2dda0ef3cc8b05f2 (diff) | |
| download | gitea-6a6636d4513b93555dd476e6d1883663e036e606.tar.gz gitea-6a6636d4513b93555dd476e6d1883663e036e606.zip | |
Merge branch 'master' of github.com:gogits/gogs into dev
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docker/README.md | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index eb5732ff60..b060c69392 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,6 @@ language: go go: - 1.2 - - 1.3
\ No newline at end of file + - 1.3 + +sudo: false @@ -1,6 +1,8 @@ Gogs - Go Git Service [](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [](https://travis-ci.org/gogits/gogs) ===================== +[](https://gitter.im/gogits/gogs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + Gogs(Go Git Service) is a painless self-hosted Git Service written in Go.  diff --git a/docker/README.md b/docker/README.md index 448912009c..9f82cf7626 100644 --- a/docker/README.md +++ b/docker/README.md @@ -30,7 +30,7 @@ The `config` file contains lines which will in the gogs docker container end up 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. -This inculdes container linking! +This includes container linking! Just have a look at them and it will be clear how to write your own blocks. @@ -53,7 +53,7 @@ Example: More sophisticated Example -------------------------- -Her is a more elaborated example +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 @@ -86,4 +86,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/
\ No newline at end of file +[fig]:http://www.fig.sh/ |