Skip to content

Commit ccba789

Browse files
committed
docs; cleanups
1 parent d415463 commit ccba789

File tree

4 files changed

+49
-26
lines changed

4 files changed

+49
-26
lines changed

README.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,25 @@ CONTAINER_USER_UID and CONTAINER_USER_GID environment variables _before_ running
207207
More details in the file docker/.env.
208208

209209

210+
## Contributing to development
211+
212+
Bug reports are welcome, as well as Pull requests. The project is managed on GitHub.
213+
214+
### Running tests
215+
216+
Once you have built the db3v4l stack once, running the test suite is a breeze:
217+
218+
./tests/01_dbstack.sh
219+
./tests/02_dbconsole.sh
220+
./tests/03_web.sh
221+
./tests/04_admin.sh
222+
223+
None of those shell scripts should fail (exit with non-zero exit code).
224+
225+
NB: when running the test suite, custom databases and database users are created then destroyed within each available
226+
database instance. It is not recommended to run the test suite if your databases already contain (important) data.
227+
228+
210229
## Thanks
211230

212231
Many thanks to

bin/dbstack

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,26 +92,6 @@ check_requirements() {
9292
fi
9393
}
9494

95-
create_compose_command() {
96-
local VENDORS
97-
DOCKER_COMPOSE_CMD='docker-compose -f docker-compose.yml'
98-
if [ -n "${COMPOSE_ONLY_VENDORS}" ]; then
99-
VENDORS=${COMPOSE_ONLY_VENDORS//,/ }
100-
else
101-
VENDORS=$(cd compose && ls -- *.yml | tr '\n' ' ')
102-
VENDORS=${VENDORS//.yml/}
103-
fi
104-
if [ -n "${COMPOSE_EXCEPT_VENDORS}" ]; then
105-
for COMPOSE_EXCEPT_VENDOR in ${COMPOSE_EXCEPT_VENDORS//,/ }; do
106-
# @bug what if a COMPOSE_EXCEPT_VENDOR is a substring of a VENDOR ?
107-
VENDORS=${VENDORS/$COMPOSE_EXCEPT_VENDOR/}
108-
done
109-
fi
110-
for DC_CONF_FILE in ${VENDORS}; do
111-
DOCKER_COMPOSE_CMD="${DOCKER_COMPOSE_CMD} -f compose/${DC_CONF_FILE}.yml"
112-
done
113-
}
114-
11595
# @todo have this function looked at by a bash guru to validate it's not a brainf**t
11696
#load_config_value() {
11797
# local VALUE=
@@ -191,6 +171,26 @@ setup_local_config() {
191171
# @todo allow setting up: custom db root account pwd, sf env, etc...
192172
}
193173

174+
create_compose_command() {
175+
local VENDORS
176+
DOCKER_COMPOSE_CMD='docker-compose -f docker-compose.yml'
177+
if [ -n "${COMPOSE_ONLY_VENDORS}" ]; then
178+
VENDORS=${COMPOSE_ONLY_VENDORS//,/ }
179+
else
180+
VENDORS=$(cd compose && ls -- *.yml | tr '\n' ' ')
181+
VENDORS=${VENDORS//.yml/}
182+
fi
183+
if [ -n "${COMPOSE_EXCEPT_VENDORS}" ]; then
184+
for COMPOSE_EXCEPT_VENDOR in ${COMPOSE_EXCEPT_VENDORS//,/ }; do
185+
# @bug what if a COMPOSE_EXCEPT_VENDOR is a substring of a VENDOR ?
186+
VENDORS=${VENDORS/$COMPOSE_EXCEPT_VENDOR/}
187+
done
188+
fi
189+
for DC_CONF_FILE in ${VENDORS}; do
190+
DOCKER_COMPOSE_CMD="${DOCKER_COMPOSE_CMD} -f compose/${DC_CONF_FILE}.yml"
191+
done
192+
}
193+
194194
build() {
195195
local IMAGES
196196

doc/WHATSNEW.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Version 0.16 (unreleased)
2-
-------------------------
1+
Version 0.16
2+
------------
33

44
- Improved: bumped minimum required docker-compose version to 1.19 in docs and tests, as that was effectively necessary
55

@@ -10,13 +10,13 @@ Version 0.16 (unreleased)
1010
to specific vendors, making it require less cpu/ram/disk resources.
1111
Example usages:
1212

13-
export COMPOSE_ONLY_VENDORS=mysql,mariadb
13+
export COMPOSE_ONLY_VENDORS=mysql,mariadb,percona
1414
./bin/dbstack start
1515

1616
export COMPOSE_EXCEPT_VENDORS=oracle,mssql
1717
./bin/dbstack start
1818

19-
- Improved: tests on Travis exercise a wider set of configuration options and execute faster
19+
- Improved: tests on Travis exercise a wider set of configuration options and execute somewhat faster
2020

2121

2222
Version 0.15

docker/.env

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COMPOSE_PROJECT_NAME=db3v4l
99

1010
# The containers get their TZ config from this;
1111
# use 'none' as null value
12-
COMPOSE_TZ=Europe/London???
12+
COMPOSE_TZ=Europe/London
1313

1414
# Use alternative debian mirrors when building 'surrogate/helper' containers. Useful if there are problems with the default mirrors
1515
# use 'none' as null value
@@ -45,6 +45,9 @@ COMPOSE_DB_SIZE=small
4545
#
4646
COMPOSE_SETUP_APP_ON_BOOT=true
4747

48+
# See the FAQ for how to use these two
49+
#COMPOSE_ONLY_VENDORS=
50+
#COMPOSE_EXCEPT_VENDORS=
4851

4952
### Settings used by all Containers
5053
# Your user ID and group for file permissions (_as used on host computer_).
@@ -89,6 +92,7 @@ POSTGRESQL_12_VERSION=12
8992
MSSQLSERVER_2017_VERSION=2017-latest
9093
MSSQLSERVER_2019_VERSION=2019-latest
9194

95+
9296
### MySQL + MariaDB Settings
9397
# NB: these are used when the db is created the 1st time the platform is executed. Changing them afterwards will have
9498
# no effect (unless you delete the db data files)
@@ -107,6 +111,6 @@ SA_PASSWORD=3v4l3V4L
107111
ORACLE_PWD=3v4l
108112

109113

110-
# pg root user
114+
# PostgreSQL root user
111115
#POSTGRES_USER=postgres
112116
POSTGRES_PASSWORD=3v4l

0 commit comments

Comments
 (0)