-
Notifications
You must be signed in to change notification settings - Fork 456
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update docker-compose test environment based on CI's tests #110
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,34 @@ | ||
phpmyadmin: | ||
image: phpmyadmin/phpmyadmin:testing | ||
container_name: myadmin | ||
version: '2' | ||
|
||
services: | ||
mariadb: | ||
image: mariadb:10.1 | ||
container_name: phpmyadmin_testing_mariadb | ||
environment: | ||
- PMA_ARBITRARY=1 | ||
restart: always | ||
- MYSQL_ROOT_PASSWORD=test123 | ||
|
||
mysql: | ||
image: mysql:5.7 | ||
container_name: phpmyadmin_testing_mysql | ||
environment: | ||
- MYSQL_ROOT_PASSWORD=test123 | ||
|
||
phpmyadmin: | ||
build: | ||
context: . | ||
dockerfile: Dockerfile | ||
container_name: phpmyadmin_testing | ||
volumes: | ||
- ./phpmyadmin_test.py:/phpmyadmin_test.py | ||
- ./test-docker.sh:/test-docker.sh | ||
- ./world.sql:/world.sql | ||
- /sessions | ||
ports: | ||
- 8090:80 | ||
- 8090:80 | ||
environment: | ||
- PMA_ARBITRARY=1 | ||
- PHPMYADMIN_RUN_TEST=true | ||
- TESTSUITE_PASSWORD=test123 | ||
depends_on: | ||
- mariadb | ||
- mysql |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
[program:test-mariadb] | ||
command=/test-docker.sh test 80 mariadb | ||
autostart=true | ||
autorestart=false | ||
priority=3 | ||
startretries=1 | ||
stopwaitsecs=20 | ||
stdout_logfile=/dev/stdout | ||
stdout_logfile_maxbytes=0 | ||
stderr_logfile=/dev/stderr | ||
stderr_logfile_maxbytes=0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
[program:test-mysql] | ||
command=/test-docker.sh test 80 mysql | ||
autostart=true | ||
autorestart=false | ||
priority=3 | ||
startretries=1 | ||
stopwaitsecs=20 | ||
stdout_logfile=/dev/stdout | ||
stdout_logfile_maxbytes=0 | ||
stderr_logfile=/dev/stderr | ||
stderr_logfile_maxbytes=0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
; Sample supervisor config file. | ||
|
||
[unix_http_server] | ||
file=/run/supervisord.sock ; (the path to the socket file) | ||
;chmod=0700 ; socked file mode (default 0700) | ||
;chown=nobody:nogroup ; socket file uid:gid owner | ||
;username=user ; (default is no username (open server)) | ||
;password=123 ; (default is no password (open server)) | ||
|
||
;[inet_http_server] ; inet (TCP) server disabled by default | ||
;port=127.0.0.1:9001 ; (ip_address:port specifier, *:port for all iface) | ||
;username=user ; (default is no username (open server)) | ||
;password=123 ; (default is no password (open server)) | ||
|
||
[supervisord] | ||
logfile=/var/log/supervisord.log ; (main log file;default $CWD/supervisord.log) | ||
;logfile_maxbytes=50MB ; (max main logfile bytes b4 rotation;default 50MB) | ||
;logfile_backups=10 ; (num of main logfile rotation backups;default 10) | ||
loglevel=info ; (log level;default info; others: debug,warn,trace) | ||
;pidfile=/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) | ||
;nodaemon=false ; (start in foreground if true;default false) | ||
;minfds=1024 ; (min. avail startup file descriptors;default 1024) | ||
;minprocs=200 ; (min. avail process descriptors;default 200) | ||
;umask=022 ; (process file creation umask;default 022) | ||
;user=chrism ; (default is current user, required if root) | ||
;identifier=supervisor ; (supervisord identifier, default is 'supervisor') | ||
;directory=/tmp ; (default is not to cd during start) | ||
;nocleanup=true ; (don't clean up tempfiles at start;default false) | ||
;childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP) | ||
;environment=KEY=value ; (key value pairs to add to environment) | ||
;strip_ansi=false ; (strip ansi escape codes in logs; def. false) | ||
|
||
; the below section must remain in the config file for RPC | ||
; (supervisorctl/web interface) to work, additional interfaces may be | ||
; added by defining them in separate rpcinterface: sections | ||
[rpcinterface:supervisor] | ||
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface | ||
|
||
[supervisorctl] | ||
serverurl=unix:///run/supervisord.sock ; use a unix:// URL for a unix socket | ||
;serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket | ||
;username=chris ; should be same as http_username if set | ||
;password=123 ; should be same as http_password if set | ||
;prompt=mysupervisor ; cmd line prompt (default "supervisor") | ||
;history_file=~/.sc_history ; use readline history if available | ||
|
||
; The below sample program section shows all possible program subsection values, | ||
; create one or more 'real' program: sections to be able to control them under | ||
; supervisor. | ||
|
||
;[program:theprogramname] | ||
;command=/bin/cat ; the program (relative uses PATH, can take args) | ||
;process_name=%(program_name)s ; process_name expr (default %(program_name)s) | ||
;numprocs=1 ; number of processes copies to start (def 1) | ||
;directory=/tmp ; directory to cwd to before exec (def no cwd) | ||
;umask=022 ; umask for process (default None) | ||
;priority=999 ; the relative start priority (default 999) | ||
;autostart=true ; start at supervisord start (default: true) | ||
;autorestart=unexpected ; whether/when to restart (default: unexpected) | ||
;startsecs=1 ; number of secs prog must stay running (def. 1) | ||
;startretries=3 ; max # of serial start failures (default 3) | ||
;exitcodes=0,2 ; 'expected' exit codes for process (default 0,2) | ||
;stopsignal=QUIT ; signal used to kill process (default TERM) | ||
;stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) | ||
;killasgroup=false ; SIGKILL the UNIX process group (def false) | ||
;user=chrism ; setuid to this UNIX account to run the program | ||
;redirect_stderr=true ; redirect proc stderr to stdout (default false) | ||
;stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO | ||
;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) | ||
;stdout_logfile_backups=10 ; # of stdout logfile backups (default 10) | ||
;stdout_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) | ||
;stdout_events_enabled=false ; emit events on stdout writes (default false) | ||
;stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO | ||
;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) | ||
;stderr_logfile_backups=10 ; # of stderr logfile backups (default 10) | ||
;stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) | ||
;stderr_events_enabled=false ; emit events on stderr writes (default false) | ||
;environment=A=1,B=2 ; process environment additions (def no adds) | ||
;serverurl=AUTO ; override serverurl computation (childutils) | ||
|
||
; The below sample eventlistener section shows all possible | ||
; eventlistener subsection values, create one or more 'real' | ||
; eventlistener: sections to be able to handle event notifications | ||
; sent by supervisor. | ||
|
||
;[eventlistener:theeventlistenername] | ||
;command=/bin/eventlistener ; the program (relative uses PATH, can take args) | ||
;process_name=%(program_name)s ; process_name expr (default %(program_name)s) | ||
;numprocs=1 ; number of processes copies to start (def 1) | ||
;events=EVENT ; event notif. types to subscribe to (req'd) | ||
;buffer_size=10 ; event buffer queue size (default 10) | ||
;directory=/tmp ; directory to cwd to before exec (def no cwd) | ||
;umask=022 ; umask for process (default None) | ||
;priority=-1 ; the relative start priority (default -1) | ||
;autostart=true ; start at supervisord start (default: true) | ||
;autorestart=unexpected ; whether/when to restart (default: unexpected) | ||
;startsecs=1 ; number of secs prog must stay running (def. 1) | ||
;startretries=3 ; max # of serial start failures (default 3) | ||
;exitcodes=0,2 ; 'expected' exit codes for process (default 0,2) | ||
;stopsignal=QUIT ; signal used to kill process (default TERM) | ||
;stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) | ||
;killasgroup=false ; SIGKILL the UNIX process group (def false) | ||
;user=chrism ; setuid to this UNIX account to run the program | ||
;redirect_stderr=true ; redirect proc stderr to stdout (default false) | ||
;stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO | ||
;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) | ||
;stdout_logfile_backups=10 ; # of stdout logfile backups (default 10) | ||
;stdout_events_enabled=false ; emit events on stdout writes (default false) | ||
;stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO | ||
;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) | ||
;stderr_logfile_backups ; # of stderr logfile backups (default 10) | ||
;stderr_events_enabled=false ; emit events on stderr writes (default false) | ||
;environment=A=1,B=2 ; process environment additions | ||
;serverurl=AUTO ; override serverurl computation (childutils) | ||
|
||
; The below sample group section shows all possible group values, | ||
; create one or more 'real' group: sections to create "heterogeneous" | ||
; process groups. | ||
|
||
;[group:thegroupname] | ||
;programs=progname1,progname2 ; each refers to 'x' in [program:x] definitions | ||
;priority=999 ; the relative start priority (default 999) | ||
|
||
; The [include] section can just contain the "files" setting. This | ||
; setting can list multiple files (separated by whitespace or | ||
; newlines). It can also contain wildcards. The filenames are | ||
; interpreted as relative to this file. Included files *cannot* | ||
; include files themselves. | ||
|
||
[include] | ||
files = /etc/supervisor.d/nginx.ini /etc/supervisor.d/php.ini | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Couldn't this be handled somehow better? Having two almost same configuration files doesn't sound good for maintenance. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
; Sample supervisor config file. | ||
|
||
[unix_http_server] | ||
file=/run/supervisord.sock ; (the path to the socket file) | ||
;chmod=0700 ; socked file mode (default 0700) | ||
;chown=nobody:nogroup ; socket file uid:gid owner | ||
;username=user ; (default is no username (open server)) | ||
;password=123 ; (default is no password (open server)) | ||
|
||
;[inet_http_server] ; inet (TCP) server disabled by default | ||
;port=127.0.0.1:9001 ; (ip_address:port specifier, *:port for all iface) | ||
;username=user ; (default is no username (open server)) | ||
;password=123 ; (default is no password (open server)) | ||
|
||
[supervisord] | ||
logfile=/var/log/supervisord.log ; (main log file;default $CWD/supervisord.log) | ||
;logfile_maxbytes=50MB ; (max main logfile bytes b4 rotation;default 50MB) | ||
;logfile_backups=10 ; (num of main logfile rotation backups;default 10) | ||
loglevel=info ; (log level;default info; others: debug,warn,trace) | ||
;pidfile=/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) | ||
;nodaemon=false ; (start in foreground if true;default false) | ||
;minfds=1024 ; (min. avail startup file descriptors;default 1024) | ||
;minprocs=200 ; (min. avail process descriptors;default 200) | ||
;umask=022 ; (process file creation umask;default 022) | ||
;user=chrism ; (default is current user, required if root) | ||
;identifier=supervisor ; (supervisord identifier, default is 'supervisor') | ||
;directory=/tmp ; (default is not to cd during start) | ||
;nocleanup=true ; (don't clean up tempfiles at start;default false) | ||
;childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP) | ||
;environment=KEY=value ; (key value pairs to add to environment) | ||
;strip_ansi=false ; (strip ansi escape codes in logs; def. false) | ||
|
||
; the below section must remain in the config file for RPC | ||
; (supervisorctl/web interface) to work, additional interfaces may be | ||
; added by defining them in separate rpcinterface: sections | ||
[rpcinterface:supervisor] | ||
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface | ||
|
||
[supervisorctl] | ||
serverurl=unix:///run/supervisord.sock ; use a unix:// URL for a unix socket | ||
;serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket | ||
;username=chris ; should be same as http_username if set | ||
;password=123 ; should be same as http_password if set | ||
;prompt=mysupervisor ; cmd line prompt (default "supervisor") | ||
;history_file=~/.sc_history ; use readline history if available | ||
|
||
; The below sample program section shows all possible program subsection values, | ||
; create one or more 'real' program: sections to be able to control them under | ||
; supervisor. | ||
|
||
;[program:theprogramname] | ||
;command=/bin/cat ; the program (relative uses PATH, can take args) | ||
;process_name=%(program_name)s ; process_name expr (default %(program_name)s) | ||
;numprocs=1 ; number of processes copies to start (def 1) | ||
;directory=/tmp ; directory to cwd to before exec (def no cwd) | ||
;umask=022 ; umask for process (default None) | ||
;priority=999 ; the relative start priority (default 999) | ||
;autostart=true ; start at supervisord start (default: true) | ||
;autorestart=unexpected ; whether/when to restart (default: unexpected) | ||
;startsecs=1 ; number of secs prog must stay running (def. 1) | ||
;startretries=3 ; max # of serial start failures (default 3) | ||
;exitcodes=0,2 ; 'expected' exit codes for process (default 0,2) | ||
;stopsignal=QUIT ; signal used to kill process (default TERM) | ||
;stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) | ||
;killasgroup=false ; SIGKILL the UNIX process group (def false) | ||
;user=chrism ; setuid to this UNIX account to run the program | ||
;redirect_stderr=true ; redirect proc stderr to stdout (default false) | ||
;stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO | ||
;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) | ||
;stdout_logfile_backups=10 ; # of stdout logfile backups (default 10) | ||
;stdout_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) | ||
;stdout_events_enabled=false ; emit events on stdout writes (default false) | ||
;stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO | ||
;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) | ||
;stderr_logfile_backups=10 ; # of stderr logfile backups (default 10) | ||
;stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) | ||
;stderr_events_enabled=false ; emit events on stderr writes (default false) | ||
;environment=A=1,B=2 ; process environment additions (def no adds) | ||
;serverurl=AUTO ; override serverurl computation (childutils) | ||
|
||
; The below sample eventlistener section shows all possible | ||
; eventlistener subsection values, create one or more 'real' | ||
; eventlistener: sections to be able to handle event notifications | ||
; sent by supervisor. | ||
|
||
;[eventlistener:theeventlistenername] | ||
;command=/bin/eventlistener ; the program (relative uses PATH, can take args) | ||
;process_name=%(program_name)s ; process_name expr (default %(program_name)s) | ||
;numprocs=1 ; number of processes copies to start (def 1) | ||
;events=EVENT ; event notif. types to subscribe to (req'd) | ||
;buffer_size=10 ; event buffer queue size (default 10) | ||
;directory=/tmp ; directory to cwd to before exec (def no cwd) | ||
;umask=022 ; umask for process (default None) | ||
;priority=-1 ; the relative start priority (default -1) | ||
;autostart=true ; start at supervisord start (default: true) | ||
;autorestart=unexpected ; whether/when to restart (default: unexpected) | ||
;startsecs=1 ; number of secs prog must stay running (def. 1) | ||
;startretries=3 ; max # of serial start failures (default 3) | ||
;exitcodes=0,2 ; 'expected' exit codes for process (default 0,2) | ||
;stopsignal=QUIT ; signal used to kill process (default TERM) | ||
;stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) | ||
;killasgroup=false ; SIGKILL the UNIX process group (def false) | ||
;user=chrism ; setuid to this UNIX account to run the program | ||
;redirect_stderr=true ; redirect proc stderr to stdout (default false) | ||
;stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO | ||
;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) | ||
;stdout_logfile_backups=10 ; # of stdout logfile backups (default 10) | ||
;stdout_events_enabled=false ; emit events on stdout writes (default false) | ||
;stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO | ||
;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) | ||
;stderr_logfile_backups ; # of stderr logfile backups (default 10) | ||
;stderr_events_enabled=false ; emit events on stderr writes (default false) | ||
;environment=A=1,B=2 ; process environment additions | ||
;serverurl=AUTO ; override serverurl computation (childutils) | ||
|
||
; The below sample group section shows all possible group values, | ||
; create one or more 'real' group: sections to create "heterogeneous" | ||
; process groups. | ||
|
||
;[group:thegroupname] | ||
;programs=progname1,progname2 ; each refers to 'x' in [program:x] definitions | ||
;priority=999 ; the relative start priority (default 999) | ||
|
||
; The [include] section can just contain the "files" setting. This | ||
; setting can list multiple files (separated by whitespace or | ||
; newlines). It can also contain wildcards. The filenames are | ||
; interpreted as relative to this file. Included files *cannot* | ||
; include files themselves. | ||
|
||
[include] | ||
files = /etc/supervisor.d/*.ini |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This pulls whole python to the image, I'd prefer to avoid that.