From 22000d5d0ca588680a32bfebc2fb32b71d1463a3 Mon Sep 17 00:00:00 2001 From: pat-s Date: Mon, 3 May 2021 20:46:17 +0200 Subject: [PATCH 1/2] bump postgres and mysql DB versions --- .drone.yml | 4 ++-- docs/content/doc/installation/with-docker-rootless.en-us.md | 4 ++-- docs/content/doc/installation/with-docker.en-us.md | 4 ++-- docs/content/doc/installation/with-docker.zh-cn.md | 4 ++-- integrations/README_ZH.md | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index d1cedb73cc5bc..f101d3464811c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -153,7 +153,7 @@ services: MYSQL_DATABASE: test - name: mysql8 - image: mysql:8.0 + image: mysql:8 environment: MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_DATABASE: testgitea @@ -319,7 +319,7 @@ trigger: services: - name: pgsql pull: default - image: postgres:9.5 + image: postgres:13 environment: POSTGRES_DB: test POSTGRES_PASSWORD: postgres diff --git a/docs/content/doc/installation/with-docker-rootless.en-us.md b/docs/content/doc/installation/with-docker-rootless.en-us.md index 672c842024d25..be4ca0e320170 100644 --- a/docs/content/doc/installation/with-docker-rootless.en-us.md +++ b/docs/content/doc/installation/with-docker-rootless.en-us.md @@ -107,7 +107,7 @@ services: + - db + + db: -+ image: mysql:5.7 ++ image: mysql:8 + restart: always + environment: + - MYSQL_ROOT_PASSWORD=gitea @@ -148,7 +148,7 @@ services: + - db + + db: -+ image: postgres:9.6 ++ image: postgres:13 + restart: always + environment: + - POSTGRES_USER=gitea diff --git a/docs/content/doc/installation/with-docker.en-us.md b/docs/content/doc/installation/with-docker.en-us.md index 83f82d85d6350..06917b5d8a411 100644 --- a/docs/content/doc/installation/with-docker.en-us.md +++ b/docs/content/doc/installation/with-docker.en-us.md @@ -137,7 +137,7 @@ services: + - db + + db: -+ image: mysql:5.7 ++ image: mysql:8 + restart: always + environment: + - MYSQL_ROOT_PASSWORD=gitea @@ -188,7 +188,7 @@ services: + - db + + db: -+ image: postgres:9.6 ++ image: postgres:13 + restart: always + environment: + - POSTGRES_USER=gitea diff --git a/docs/content/doc/installation/with-docker.zh-cn.md b/docs/content/doc/installation/with-docker.zh-cn.md index d32b774c201a0..f823e0d749596 100644 --- a/docs/content/doc/installation/with-docker.zh-cn.md +++ b/docs/content/doc/installation/with-docker.zh-cn.md @@ -122,7 +122,7 @@ services: + - db + + db: -+ image: mysql:5.7 ++ image: mysql:8 + restart: always + environment: + - MYSQL_ROOT_PASSWORD=gitea @@ -172,7 +172,7 @@ services: + - db + + db: -+ image: postgres:9.6 ++ image: postgres:13 + restart: always + environment: + - POSTGRES_USER=gitea diff --git a/integrations/README_ZH.md b/integrations/README_ZH.md index fd317645603a7..39639f9b89adf 100644 --- a/integrations/README_ZH.md +++ b/integrations/README_ZH.md @@ -26,7 +26,7 @@ make test-sqlite ## 如何使用 mysql 数据库进行集成测试 首先在docker容器里部署一个 mysql 数据库 ``` -docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:5.7 #(just ctrl-c to stop db and clean the container) +docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:8 #(just ctrl-c to stop db and clean the container) ``` 之后便可以基于这个数据库进行集成测试 ``` @@ -36,7 +36,7 @@ TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test TEST_MYSQL_USERNAME=root T ## 如何使用 pgsql 数据库进行集成测试 同上，首先在 docker 容器里部署一个 pgsql 数据库 ``` -docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:9.5 #(just ctrl-c to stop db and clean the container) +docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:13 #(just ctrl-c to stop db and clean the container) ``` 之后便可以基于这个数据库进行集成测试 ``` From 99afb316891be733ababa70b19de09a4525a85a0 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 16 May 2021 19:40:01 +0200 Subject: [PATCH 2/2] posgres test against v10 --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f101d3464811c..d6486426d4eb0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -319,7 +319,7 @@ trigger: services: - name: pgsql pull: default - image: postgres:13 + image: postgres:10 environment: POSTGRES_DB: test POSTGRES_PASSWORD: postgres