Skip to content

Commit

Permalink
Improve Docker container name (go-gitea#13077)
Browse files Browse the repository at this point in the history
* Improve Docker container name

Use a better Docker container name than the default 'server'

* Changing to gitea and use recommended v3 Docker-compose

Use `gitea` as container name. And use version 3 of the docker-compose, which should now be used: https://docs.docker.com/compose/compose-file/compose-versioning/

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
  • Loading branch information
melroy89 and techknowlogick authored Oct 9, 2020
1 parent 9b81193 commit 508aca1
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions docs/content/doc/installation/with-docker.en-us.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Also be aware that the tag `:latest` will install the current development versio
For a stable release you can use `:1` or specify a certain release like `:{{< version >}}`.

```yaml
version: "2"
version: "3"

networks:
gitea:
Expand All @@ -43,6 +43,7 @@ networks:
services:
server:
image: gitea/gitea:latest
container_name: gitea
environment:
- USER_UID=1000
- USER_GID=1000
Expand All @@ -65,7 +66,7 @@ the port section. It's common to just change the host port and keep the ports wi
the container like they are.
```diff
version: "2"
version: "3"

networks:
gitea:
Expand All @@ -74,6 +75,7 @@ networks:
services:
server:
image: gitea/gitea:latest
container_name: gitea
environment:
- USER_UID=1000
- USER_GID=1000
Expand All @@ -97,7 +99,7 @@ To start Gitea in combination with a MySQL database, apply these changes to the
`docker-compose.yml` file created above.

```diff
version: "2"
version: "3"

networks:
gitea:
Expand All @@ -106,6 +108,7 @@ networks:
services:
server:
image: gitea/gitea:latest
container_name: gitea
environment:
- USER_UID=1000
- USER_GID=1000
Expand Down Expand Up @@ -147,7 +150,7 @@ To start Gitea in combination with a PostgreSQL database, apply these changes to
the `docker-compose.yml` file created above.

```diff
version: "2"
version: "3"

networks:
gitea:
Expand All @@ -156,6 +159,7 @@ networks:
services:
server:
image: gitea/gitea:latest
container_name: gitea
environment:
- USER_UID=1000
- USER_GID=1000
Expand Down Expand Up @@ -198,7 +202,7 @@ create the required volume. You don't need to worry about permissions with
named volumes; Docker will deal with that automatically.

```diff
version: "2"
version: "3"

networks:
gitea:
Expand All @@ -211,6 +215,7 @@ networks:
services:
server:
image: gitea/gitea:latest
container_name: gitea
restart: always
networks:
- gitea
Expand Down Expand Up @@ -306,9 +311,12 @@ UID/GID as the container values `USER_UID`/`USER_GID`. You should also create th
`/var/lib/gitea` on the host, owned by the `git` user and mounted in the container, e.g.

```
version: "3"
services:
server:
image: gitea/gitea:latest
container_name: gitea
environment:
- USER_UID=1000
- USER_GID=1000
Expand Down

0 comments on commit 508aca1

Please sign in to comment.