Skip to content

Commit

Permalink
feat: add maria 10.11, drop 10.3 (#45)
Browse files Browse the repository at this point in the history
  • Loading branch information
iBotPeaches authored Apr 17, 2023
1 parent 8608372 commit 8843dfe
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ cd ./devop-tools/docker/data-source-services && docker-compose up --build -d
## phpMyAdmin
If the optional tools are launched, you can find phpMyAdmin at: localhost:8080
* It supports the following databases...
* mariadb103 (deprecated)
* mariadb104
* mariadb105
* mariadb106
* mariadb104 (deprecated)
* mariadb105 (deprecated)
* mariadb106 (lts)
* mariadb1011 (lts)

## Examples
Inside the `examples` folder you will find example Docker configurations for
Expand Down
22 changes: 11 additions & 11 deletions docker/data-source-services/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ services:
- ./proxy_increase.conf:/etc/nginx/proxy.conf
networks:
- st-internal
mariadb1011:
image: mariadb:10.11
container_name: sourcetoad_mariadb1011
ports:
- "33111:3311"
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_USER=mariadb_user
- MYSQL_PASSWORD=mariadb_pass
networks:
- st-internal
mariadb106:
image: mariadb:10.6
container_name: sourcetoad_mariadb106
Expand Down Expand Up @@ -49,17 +60,6 @@ services:
- MYSQL_PASSWORD=mariadb_pass
networks:
- st-internal
mariadb103:
image: mariadb:10.3
container_name: sourcetoad_mariadb103
ports:
- "33103:3306"
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_USER=mariadb_user
- MYSQL_PASSWORD=mariadb_pass
networks:
- st-internal
networks:
st-internal:
external: true
Expand Down
2 changes: 1 addition & 1 deletion docker/data-source-tools/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
networks:
- st-internal
environment:
PMA_HOSTS: mariadb103,mariadb104,mariadb105,mariadb106
PMA_HOSTS: mariadb104,mariadb105,mariadb106,mariadb1011
PMA_USER: root
PMA_PASSWORD: root
networks:
Expand Down

0 comments on commit 8843dfe

Please sign in to comment.