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 <[email protected]>
Co-authored-by: TheFox0x7 <[email protected]>
Co-committed-by: TheFox0x7 <[email protected]>
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
@@ -33,7 +33,7 @@ version: "2"
services:
server:
image: gitea/gitea:@dockerVersion@-rootless
image: docker.io/gitea/gitea:@dockerVersion@-rootless
restart: always
volumes:
- ./data:/var/lib/gitea
@@ -64,7 +64,7 @@ version: "2"
services:
server:
image: gitea/gitea:@dockerVersion@-rootless
image: docker.io/gitea/gitea:@dockerVersion@-rootless
restart: always
volumes:
- ./data:/var/lib/gitea
@@ -87,7 +87,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
@@ -107,7 +107,7 @@ services:
+ - db
+
+ db:
+ image: mysql:8
+ image: docker.io/library/mysql:8
+ restart: always
+ environment:
+ - MYSQL_ROOT_PASSWORD=gitea
@@ -127,7 +127,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
@@ -147,7 +147,7 @@ services:
+ - db
+
+ db:
+ image: postgres:14
+ image: docker.io/library/postgres:14
+ restart: always
+ environment:
+ - POSTGRES_USER=gitea
@@ -172,7 +172,7 @@ version: "2"
+
services:
server:
image: gitea/gitea:@dockerVersion@-rootless
image: docker.io/gitea/gitea:@dockerVersion@-rootless
restart: always
volumes:
- - ./data:/var/lib/gitea
@@ -199,7 +199,7 @@ version: "2"
services:
server:
image: gitea/gitea:@dockerVersion@-rootless
image: docker.io/gitea/gitea:@dockerVersion@-rootless
restart: always
+ user: 1001
volumes:
@@ -252,7 +252,7 @@ docker-compose up -d
- 将卷中的文件夹(gitea)重命名为 custom
- 如果需要,编辑 `app.ini`
- 设置 `START_SSH_SERVER = true`
- 使用镜像 `gitea/gitea:@dockerVersion@-rootless`
- 使用镜像 ` docker.io/gitea/gitea:@dockerVersion@-rootless`
## 使用环境变量管理部署
@@ -28,7 +28,7 @@ networks:
services:
server:
image: gitea/gitea:@dockerVersion@
image: docker.io/gitea/gitea:@dockerVersion@
container_name: gitea
environment:
- USER_UID=1000
@@ -58,7 +58,7 @@ networks:
services:
server:
image: gitea/gitea:@dockerVersion@
image: docker.io/gitea/gitea:@dockerVersion@
container_name: gitea
environment:
- USER_UID=1000
@@ -92,7 +92,7 @@ networks:
services:
server:
image: gitea/gitea:@dockerVersion@
image: docker.io/gitea/gitea:@dockerVersion@
container_name: gitea
environment:
- USER_UID=1000
@@ -116,7 +116,7 @@ services:
+ - db
+
+ db:
+ image: mysql:8
+ image: docker.io/library/mysql:8
+ restart: always
+ environment:
+ - MYSQL_ROOT_PASSWORD=gitea
@@ -142,7 +142,7 @@ networks:
services:
server:
image: gitea/gitea:@dockerVersion@
image: docker.io/gitea/gitea:@dockerVersion@
container_name: gitea
environment:
- USER_UID=1000
@@ -166,7 +166,7 @@ services:
+ - db
+
+ db:
+ image: postgres:14
+ image: docker.io/library/postgres:14
+ restart: always
+ environment:
+ - POSTGRES_USER=gitea
@@ -195,7 +195,7 @@ networks:
+
services:
server:
image: gitea/gitea:@dockerVersion@
image: docker.io/gitea/gitea:@dockerVersion@
container_name: gitea
restart: always
networks:
@@ -292,8 +292,8 @@ Gitea 将为每次新安装自动生成新的 `SECRET_KEY` 并将它们写入 `a
以下命令将向 `stdout` 输出一个新的 `SECRET_KEY``INTERNAL_TOKEN`,然后您可以将其放入环境变量中。
```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