Skip to content

Commit e136136

Browse files
committed
cosmetic dockerc-compose
1 parent 27e2bec commit e136136

2 files changed

Lines changed: 23 additions & 16 deletions

File tree

doc/docker/docker-compose.dev8.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
version: '3.8'
1+
# Louis BAYLE, 2023-10-22
2+
# ====================================================
3+
# Run with docker-compose:
4+
#
5+
# mkdir -p /data/docker
6+
# cd /data/docker
7+
# git clone https://github.com/lbayle/codev.git codevtt
8+
# wget https://raw.githubusercontent.com/lbayle/codev/master/doc/docker/docker-compose.dev8.yml
9+
# wget https://raw.githubusercontent.com/lbayle/codev/master/doc/docker/mantis_codevtt_freshInstall.sql
10+
# docker-compose -f docker-compose.dev8.yml up -d
11+
# docker exec -i docker-mariadb-1 mysql -uroot -pmy_password --force bugtracker < mantis_codevtt_freshInstall.sql
212

3-
# --- docker-compose.dev.yml ---
4-
# This docker-compose file mounts a dev environment for CodevTT
5-
# 1) you have cloned CodevTT localy from git@gitlab.com:lbayle/codevtt.git
6-
# 2) it assumes that you have already build an image of mantis/codevtt with
7-
# https://gitlab.com/lbayle/codevtt/-/blob/master/doc/docker/Dockerfile_dev8
13+
version: '3.8'
814

915
services:
10-
# ---------------------------------------------------------
16+
# ---------------------------------------------------------
1117
# docker exec -i mariadb-codevtt mariadb -uroot -pmy_password --force bugtracker < mantis_codevtt_freshInstall.sql
1218
mariadb:
1319
image: mariadb:latest
@@ -49,11 +55,14 @@ services:
4955
volumes:
5056
- /data/docker/mantis-codevtt/logs-httpd:/var/log/httpd/
5157
- /data/docker/mantis-codevtt/logs:/tmp/codevtt/logs
58+
- /data/docker/mantis-codevtt/mantis/uploaded_files:/var/www/html/mantis/uploaded_files
5259
- /data/docker/mantis-codevtt/mantis/config:/var/www/html/mantis/config
5360
- /data/docker/mantis-codevtt/mantis/plugins:/var/www/html/mantis/plugins
54-
- /data/docker/mantis-codevtt/mantis/uploaded_files:/var/www/html/mantis/uploaded_files
55-
# Development: CodevTT src code is not in the container to be easily accessed by IDE & git
61+
# - /data/docker/mantis-codevtt/codevtt/config:/var/www/html/codevtt/config
62+
63+
# Development: CodevTT & MantisBT src code are not in the container to be easily accessed by IDE & git
5664
- /data/docker/mantis-codevtt/codevtt:/var/www/html/codevtt
65+
# - /data/docker/mantis-codevtt/mantis/var/www/html/mantis
5766

5867
# ---------------------------------------------------------
5968
phpmyadmin:
@@ -81,4 +90,3 @@ networks:
8190
driver: bridge
8291

8392
# end.
84-

doc/docker/docker-compose.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
# cd /data/docker
77
# wget https://raw.githubusercontent.com/lbayle/codev/master/doc/docker/docker-compose.yml
88
# wget https://raw.githubusercontent.com/lbayle/codev/master/doc/docker/mantis_codevtt_freshInstall.sql
9-
# docker-compose up -d
9+
# docker-compose up -d
1010
# docker exec -i docker-mariadb-1 mysql -uroot -pmy_password --force bugtracker < mantis_codevtt_freshInstall.sql
1111

1212
version: '3.8'
13-
services:
1413

14+
services:
1515
# ---------------------------------------------------------
16-
# docker exec -i docker-mariadb-1 mariadb -uroot -pmy_password --force bugtracker < mantis_codevtt_freshInstall.sql
17-
16+
# docker exec -i mariadb-codevtt mariadb -uroot -pmy_password --force bugtracker < mantis_codevtt_freshInstall.sql
1817
mariadb:
19-
image: centos/mariadb:latest
18+
image: mariadb:latest
2019
hostname: 'mariadb'
2120
container_name: mariadb-codevtt
2221
restart: unless-stopped
@@ -32,7 +31,7 @@ services:
3231
networks:
3332
- codevtt_net
3433
volumes:
35-
- /data/docker/mariadb:/var/lib/mysql
34+
- /data/docker/mariadb/mysql:/var/lib/mysql
3635
- /data/docker/mariadb/logs:/var/log/mariadb
3736
- /data/docker/mariadb/conf.d:/etc/mysql/conf.d
3837

0 commit comments

Comments
 (0)