use fqin for container images (#125)

It's generally considered a better practice and it's more portable allowing podman to work without having to modify the name.

Reviewed-on: https://gitea.com/gitea/docs/pulls/125
Reviewed-by: Lunny Xiao <lunny@noreply.gitea.com>
Co-authored-by: TheFox0x7 <thefox0x7@gmail.com>
Co-committed-by: TheFox0x7 <thefox0x7@gmail.com>
This commit is contained in:
TheFox0x7
2024-12-17 20:23:46 +00:00
committed by Lunny Xiao
parent 2b9cc256ea
commit 7a4e79c937
48 changed files with 236 additions and 236 deletions

View File

@@ -21,7 +21,7 @@ In order to get file rendering through external binaries, their associated packa
If you're using a Docker image, your `Dockerfile` should contain something along this lines:
```docker
FROM gitea/gitea:@dockerVersion@
FROM docker.io/gitea/gitea:@dockerVersion@
[...]
COPY custom/app.ini /data/gitea/conf/app.ini

View File

@@ -329,7 +329,7 @@ If you want traefik to serve your Gitea instance, you can add the following labe
```yaml
gitea:
image: gitea/gitea
image: docker.io/gitea/gitea
...
labels:
- "traefik.enable=true"

View File

@@ -36,7 +36,7 @@ version: "2"
services:
server:
image: gitea/gitea:@dockerVersion@-rootless
image: docker.io/gitea/gitea:@dockerVersion@-rootless
restart: always
volumes:
- ./data:/var/lib/gitea
@@ -69,7 +69,7 @@ version: "2"
services:
server:
image: gitea/gitea:@dockerVersion@-rootless
image: docker.io/gitea/gitea:@dockerVersion@-rootless
restart: always
volumes:
- ./data:/var/lib/gitea
@@ -93,7 +93,7 @@ version: "2"
services:
server:
image: gitea/gitea:@dockerVersion@-rootless
image: docker.io/gitea/gitea:@dockerVersion@-rootless
+ environment:
+ - GITEA__database__DB_TYPE=mysql
+ - GITEA__database__HOST=db:3306
@@ -113,7 +113,7 @@ services:
+ - db
+
+ db:
+ image: mysql:8
+ image: docker.io/library/mysql:8
+ restart: always
+ environment:
+ - MYSQL_ROOT_PASSWORD=gitea
@@ -134,7 +134,7 @@ version: "2"
services:
server:
image: gitea/gitea:@dockerVersion@-rootless
image: docker.io/gitea/gitea:@dockerVersion@-rootless
environment:
+ - GITEA__database__DB_TYPE=postgres
+ - GITEA__database__HOST=db:5432
@@ -154,7 +154,7 @@ services:
+ - db
+
+ db:
+ image: postgres:14
+ image: docker.io/library/postgres:14
+ restart: always
+ environment:
+ - POSTGRES_USER=gitea
@@ -182,7 +182,7 @@ version: "2"
+
services:
server:
image: gitea/gitea:@dockerVersion@-rootless
image: docker.io/gitea/gitea:@dockerVersion@-rootless
restart: always
volumes:
- - ./data:/var/lib/gitea
@@ -209,7 +209,7 @@ version: "2"
services:
server:
image: gitea/gitea:@dockerVersion@-rootless
image: docker.io/gitea/gitea:@dockerVersion@-rootless
restart: always
+ user: 1001
volumes:
@@ -281,7 +281,7 @@ docker-compose up -d
- Rename folder (inside volume) gitea to custom
- Edit app.ini if needed
- Set START_SSH_SERVER = true
- Use image gitea/gitea:@dockerVersion@-rootless
- Use image docker.io/gitea/gitea:@dockerVersion@-rootless
## Managing Deployments With Environment Variables

View File

@@ -32,7 +32,7 @@ networks:
services:
server:
image: gitea/gitea:@dockerVersion@
image: docker.io/gitea/gitea:@dockerVersion@
container_name: gitea
environment:
- USER_UID=1000
@@ -64,7 +64,7 @@ networks:
services:
server:
image: gitea/gitea:@dockerVersion@
image: docker.io/gitea/gitea:@dockerVersion@
container_name: gitea
environment:
- USER_UID=1000
@@ -99,7 +99,7 @@ networks:
services:
server:
image: gitea/gitea:@dockerVersion@
image: docker.io/gitea/gitea:@dockerVersion@
container_name: gitea
environment:
- USER_UID=1000
@@ -123,7 +123,7 @@ services:
+ - db
+
+ db:
+ image: mysql:8
+ image: docker.io/library/mysql:8
+ restart: always
+ environment:
+ - MYSQL_ROOT_PASSWORD=gitea
@@ -150,7 +150,7 @@ networks:
services:
server:
image: gitea/gitea:@dockerVersion@
image: docker.io/gitea/gitea:@dockerVersion@
container_name: gitea
environment:
- USER_UID=1000
@@ -174,7 +174,7 @@ services:
+ - db
+
+ db:
+ image: postgres:14
+ image: docker.io/library/postgres:14
+ restart: always
+ environment:
+ - POSTGRES_USER=gitea
@@ -206,7 +206,7 @@ networks:
+
services:
server:
image: gitea/gitea:@dockerVersion@
image: docker.io/gitea/gitea:@dockerVersion@
container_name: gitea
restart: always
networks:
@@ -305,8 +305,8 @@ Gitea will generate new secrets/tokens for every new installation automatically
The following commands will output a new `SECRET_KEY` and `INTERNAL_TOKEN` to `stdout`, which you can then place in your environment variables.
```bash
docker run -it --rm gitea/gitea:1 gitea generate secret SECRET_KEY
docker run -it --rm gitea/gitea:1 gitea generate secret INTERNAL_TOKEN
docker run -it --rm docker.io/gitea/gitea:1 gitea generate secret SECRET_KEY
docker run -it --rm docker.io/gitea/gitea:1 gitea generate secret INTERNAL_TOKEN
```
```yaml