Skip to content

Commit 351e868

Browse files
author
Gaetano Giunta
committed
docs
1 parent 4028f9f commit 351e868

File tree

2 files changed

+35
-19
lines changed

2 files changed

+35
-19
lines changed

README.md

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ b) allow doing full-fledged performance testing, comparing results across many d
1111
*** Work In Progress ***
1212

1313
Broad advancement status:
14-
- command-line interface to execute SQL snippets on multiple databases and compare results: mostly done.
15-
Major missing features: proper support for character sets
14+
- command-line interface to execute SQL snippets on multiple databases and compare results: basically done
1615
- database support: good coverage. Of the 'well-known players', only Oracle is missing
17-
- GUI interface: displays documentation and the list of databases. It also includes Adminer for db management, but
16+
- GUI interface: displays documentation and the list of databases. It also includes Adminer for db management, but it
1817
does not allow parallel execution of queries
1918

2019
See the [TODO](./doc/TODO.md) and [CHANGELOG](./doc/WHATSNEW.md) files for more details on recent improvements and future plans.
@@ -44,20 +43,18 @@ In the meantime, you can try out http://sqlfiddle.com/
4443

4544
## Quick Start
4645

47-
NB: if you have no bash shell interpreter on your host computer, look at the end of this document for alternative instructions
46+
NB: if you don't have a bash shell interpreter on your host computer, look at the end of this document for alternative instructions
4847

4948
### Installation
5049

5150
./bin/stack.sh build
5251

5352
*NB*: this will take a _long_time. Also, a fast, unmetered internet connection will help.
5453

55-
*NB*: if the user-id and group-id of the account that you are using on the host computer are not 1000:1000, edit
56-
the file docker/containers.env.local _before_ running the `build` command, and add in there correct values for
57-
the CONTAINER_USER_UID and CONTAINER_USER_GID environment variables. More details in the file docker/containers.env.
58-
5954
*NB*: the containers by default expose a web application on ports 80 and 443. If any of those ports are in use on
60-
the host computer, please change variables COMPOSE_WEB_LISTEN_PORT_HTTP and COMPOSE_WEB_LISTEN_PORT_HTTPS in file .env
55+
the host computer, please change variables COMPOSE_WEB_LISTEN_PORT_HTTP and COMPOSE_WEB_LISTEN_PORT_HTTPS in file
56+
docker/.env
57+
6158

6259
### Usage
6360

@@ -109,13 +106,17 @@ Last but not least, you have access to other command-line tools which can be use
109106

110107
### Troubleshooting
111108

112-
After starting the containers via `docker-compose up -d`, you can:
109+
After starting the containers via `./bin/stack.sh build`, you can:
113110

114-
- check if they are all running: `docker-compose ps`
115-
- check if they all bootstrapped correctly: `docker-compose logs`
116-
- check if one container bootstrapped correctly, eg: `docker-compose logs db3v4l_postgresql_9_4`
111+
- check if they are all running: `./bin/stack.sh ps`
112+
- check if they all bootstrapped correctly: `./bin/stack.sh logs`
113+
- check if a specific container bootstrapped correctly, eg: `./bin/stack.sh logs postgresql_9_4`
117114
- check the processes running in one container, eg: `docker exec -ti db3v4l_postgresql_9_4 ps aux`
118115

116+
*NB*: if the `stack.sh` command fails, you can use `docker` and `docker-compose` commands for troubleshooting.
117+
See the section 'Alternative commands to stack.sh' below for examples.
118+
119+
119120
### Maintenance
120121

121122
3 scripts are provided in the top-level `bin` folder to help keeping disk space usage under control
@@ -128,6 +129,10 @@ See the [FAQ](./doc/FAQ.md) for more details
128129

129130
## Alternative commands to stack.sh
130131

132+
The `stack.sh` command requires a working bash shell interpreter as well as a few, common unix command-line tools.
133+
In case those are not available on your platform (eg. if you are running DB-3v4l on Windows), or if `stack.sh` fails
134+
you can run alternative commands, as detailed here:
135+
131136
./bin/stack.sh build => cd docker && touch containers.env.local && docker-compose build
132137
./bin/stack.sh start => cd docker && docker-compose up -d
133138
./bin/stack.sh shell => docker exec -ti db3v4l_worker su - db3v4l
@@ -137,6 +142,10 @@ See the [FAQ](./doc/FAQ.md) for more details
137142
docker exec -ti db3v4l_worker su - db3v4l
138143
php bin/dbconsole ...
139144

145+
*NB*: if the user-id and group-id of the account that you are using on the host computer are not 1000:1000, edit
146+
the file docker/containers.env.local _before_ running the `build` command above, and add in there correct values for
147+
the CONTAINER_USER_UID and CONTAINER_USER_GID environment variables. More details in the file docker/containers.env.
148+
140149

141150
## Thanks
142151

doc/WHATSNEW.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
Version 0.8 (unreleased)
2-
------------------------
1+
Version 0.8
2+
-----------
3+
4+
- Changed: moved MS SQL Server 2017 version from cu17 to cu18
35

46
- New: it is now possible to specify the collation / character set used when creating new databases.
57
Please note that this is supported with many limitations:
@@ -26,8 +28,12 @@ Version 0.8 (unreleased)
2628

2729
Note: the standard `console` command is still available.
2830

31+
- Improved: all console/dbconsole commands report a non-zero exit code when a database action fails
32+
33+
- Improved: better reporting of time spent and memory used by console/dbconsole commands when a database action fails
34+
2935
- Improved: `stack.sh` will now set up automatically user id and group id in file `docker/containers.env.local` when
30-
first building the images, in cse they differ from the default ones declared in `docker/containers.env`
36+
building the images for the first time, in case they differ from the default ones declared in `docker/containers.env`
3137

3238
- Improved: `stack.sh` has a new `-p` option for building containers in parallel. The pre-existing option `-p` has been
3339
renamed to `-s`
@@ -38,12 +44,13 @@ Version 0.8 (unreleased)
3844
- Improved: `stack.sh logs` now accepts an argument, which is the name of a docker service, to only show its logs.
3945
eg. `stack.sh logs worker`
4046

41-
- Improved: The MariaDB and MySQL databases will now properly update to the latest available minor version during the
47+
- Improved: the MariaDB and MySQL databases will now properly update to the latest available minor version during the
4248
build of the containers
4349

44-
- Improved: the application is now tested on Travis. Tests are still quite basic and do not cover all functionality
50+
- Improved: all non-database containers are now based on the same upstream image (buster-slim); this should speed up
51+
build time as well as produce slightly smaller container images
4552

46-
- Changed: moved MS SQL Server 2017 version from cu17 to cu18
53+
- Improved: the application is now tested on Travis. Tests are still quite basic and do not cover all functionality
4754

4855

4956
Version 0.7.1

0 commit comments

Comments
 (0)