Skip to content

Commit 9d48289

Browse files
authored
feat: add maria 10.6, drop 10.2 (#41)
1 parent 28a6911 commit 9d48289

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ cd ./devop-tools/docker/data-source-services && docker-compose up --build -d
3939
## phpMyAdmin
4040
If the optional tools are launched, you can find phpMyAdmin at: localhost:8080
4141
* It supports the following databases...
42-
* mariadb102 (deprecated)
43-
* mariadb103
42+
* mariadb103 (deprecated)
4443
* mariadb104
4544
* mariadb105
45+
* mariadb106
4646

4747
## Examples
4848
Inside the `examples` folder you will find example Docker configurations for

docker/data-source-services/docker-compose.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@ services:
1616
- ./proxy_increase.conf:/etc/nginx/proxy.conf
1717
networks:
1818
- st-internal
19+
mariadb106:
20+
image: mariadb:10.6
21+
container_name: sourcetoad_mariadb106
22+
ports:
23+
- "33106:3306"
24+
environment:
25+
- MYSQL_ROOT_PASSWORD=root
26+
- MYSQL_USER=mariadb_user
27+
- MYSQL_PASSWORD=mariadb_pass
28+
networks:
29+
- st-internal
1930
mariadb105:
2031
image: mariadb:10.5
2132
container_name: sourcetoad_mariadb105
@@ -49,17 +60,6 @@ services:
4960
- MYSQL_PASSWORD=mariadb_pass
5061
networks:
5162
- st-internal
52-
mariadb102:
53-
image: mariadb:10.2
54-
container_name: sourcetoad_mariadb102
55-
ports:
56-
- "33102:3306"
57-
environment:
58-
- MYSQL_ROOT_PASSWORD=root
59-
- MYSQL_USER=mariadb_user
60-
- MYSQL_PASSWORD=mariadb_pass
61-
networks:
62-
- st-internal
6363
networks:
6464
st-internal:
6565
name: st-internal

docker/data-source-tools/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
networks:
99
- st-internal
1010
environment:
11-
PMA_HOSTS: mariadb102,mariadb103,mariadb104,mariadb105
11+
PMA_HOSTS: mariadb103,mariadb104,mariadb105,mariadb106
1212
PMA_USER: root
1313
PMA_PASSWORD: root
1414
networks:

0 commit comments

Comments
 (0)