Skip to content

Commit cfba16f

Browse files
cytopiacytopia
committed
Restore failed rebase
1 parent ef2f39f commit cfba16f

File tree

26 files changed

+120
-424
lines changed

26 files changed

+120
-424
lines changed

‎.devilbox/etc/mariadb-10.2/.keepme

Whitespace-only changes.

‎.devilbox/etc/mariadb-10.3/.keepme

Whitespace-only changes.

‎.devilbox/etc/mariadb-5.5/.keepme

Whitespace-only changes.

‎.devilbox/etc/mysql-5.5/.keepme

Whitespace-only changes.

‎.devilbox/etc/mysql-5.6/.keepme

Whitespace-only changes.

‎.devilbox/etc/mysql-5.7/.keepme

Whitespace-only changes.

‎.devilbox/etc/mysql-8.0/.keepme

Whitespace-only changes.

‎.devilbox/etc/mysql-8.0/charset.cnf

-10
This file was deleted.

‎.devilbox/www/config.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
1414

1515

16-
$DEVILBOX_VERSION = 'v0.15.0';
17-
$DEVILBOX_DATE = '2019-03-18';
16+
$DEVILBOX_VERSION = 'v1.0.0-alpha1';
17+
$DEVILBOX_DATE = '2019-03-09';
1818
$DEVILBOX_API_PAGE = 'devilbox-api/status.json';
1919

2020
//

‎.devilbox/www/htdocs/index.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -679,14 +679,14 @@
679679
<?php if ($avail_mysql): ?>
680680
<tr>
681681
<th>mysql</th>
682-
<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_MYSQL_DATADIR').'/'.loadClass('Helper')->getEnv('MYSQL_SERVER'); ?></td>
682+
<td>Docker volume</td>
683683
<td>/var/lib/mysql</td>
684684
</tr>
685685
<?php endif; ?>
686686
<?php if ($avail_pgsql): ?>
687687
<tr>
688688
<th>pgsql</th>
689-
<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_PGSQL_DATADIR').'/'.loadClass('Helper')->getEnv('PGSQL_SERVER'); ?></td>
689+
<td>Docker volume</td>
690690
<td>/var/lib/postgresql/data/pgdata</td>
691691
</tr>
692692
<?php endif; ?>
@@ -707,7 +707,7 @@
707707
<?php if ($avail_mongo): ?>
708708
<tr>
709709
<th>mongo</th>
710-
<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_MONGO_DATADIR'); ?></td>
710+
<td>Docker volume</td>
711711
<td>/data/db</td>
712712
</tr>
713713
<?php endif; ?>

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,12 @@
4747
/cfg/mariadb-10.0/*.cnf
4848
/cfg/mariadb-10.1/*.cnf
4949
/cfg/mariadb-10.2/*.cnf
50+
/cfg/mariadb-10.3/*.cnf
51+
/cfg/mariadb-10.4/*.cnf
5052
/cfg/percona-5.5/*.cnf
5153
/cfg/percona-5.6/*.cnf
5254
/cfg/percona-5.7/*.cnf
55+
/cfg/percona-8.0/*.cnf
5356

5457
# Ignore custom PHP.ini configs
5558
/cfg/php-ini-5.2/*.ini

‎.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,12 @@ env:
142142
- S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.0
143143
- S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.1
144144
- S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.2
145+
- S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.3
146+
- S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.4
145147
- S1=PHP V1=7.2 S2=MYSQL V2=percona-5.5
146148
- S1=PHP V1=7.2 S2=MYSQL V2=percona-5.6
147149
- S1=PHP V1=7.2 S2=MYSQL V2=percona-5.7
150+
- S1=PHP V1=7.2 S2=MYSQL V2=percona-8.0
148151
# PHP 7.2 vs PgSQL
149152
- S1=PHP V1=7.2 S2=PGSQL V2=9.0
150153
- S1=PHP V1=7.2 S2=PGSQL V2=9.1

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ major versions.
1616
- Use Docker volumes instead of directory mounts for stateful data (MySQL, PgSQL and MongoDB)
1717
- This fixes various mount issues on Windows: #175 #382
1818
- This improves general performance
19+
- Use Official MySQL, MariaDB and Percona Docker container
1920

2021

2122
## v0.15.0

‎README.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ Every single attachable container comes with many different versions. In order t
214214
<td><a target="_blank" title="Apache 2.2" href="https://github.com/devilbox/docker-apache-2.2">2.2</a></td>
215215
<td><a target="_blank" title="Nginx stable" href="https://github.com/devilbox/docker-nginx-stable">stable</a></td>
216216
<td><a target="_blank" title="PHP 5.2" href="https://github.com/devilbox/docker-php-fpm">5.2</a><sup>[1]</sup></td>
217-
<td><a target="_blank" title="MySQL 5.5" href="https://github.com/cytopia/docker-mysql-5.5">5.5</a></td>
218-
<td><a target="_blank" title="MariaDB 5.5" href="https://github.com/cytopia/docker-mariadb-5.5">5.5</a></td>
219-
<td><a target="_blank" title="PerconaDB 5.5" href="https://github.com/cytopia/docker-percona-5.5">5.5</a></td>
217+
<td><a target="_blank" title="MySQL 5.5" href="https://github.com/devilbox/docker-mysql">5.5</a></td>
218+
<td><a target="_blank" title="MariaDB 5.5" href="https://github.com/devilbox/docker-mysql">5.5</a></td>
219+
<td><a target="_blank" title="PerconaDB 5.5" href="https://github.com/devilbox/docker-mysql">5.5</a></td>
220220
<td><a target="_blank" title="PgSQL 9.0" href="https://github.com/docker-library/postgres">9.0</a></td>
221221
<td><a target="_blank" title="Redis 2.8" href="https://github.com/docker-library/redis">2.8</a></td>
222222
<td><a target="_blank" title="Memcached 1.4" href="https://github.com/docker-library/memcached">1.4</a></td>
@@ -226,9 +226,9 @@ Every single attachable container comes with many different versions. In order t
226226
<td><a target="_blank" title="Apache 2.4" href="https://github.com/devilbox/docker-apache-2.4">2.4</a></td>
227227
<td><a target="_blank" title="Nginx mainline" href="https://github.com/devilbox/docker-nginx-mainline">mainline</a></td>
228228
<td><a target="_blank" title="PHP 5.3" href="https://github.com/devilbox/docker-php-fpm">5.3</a></td>
229-
<td><a target="_blank" title="MySQL 5.6" href="https://github.com/cytopia/docker-mysql-5.6">5.6</a></td>
230-
<td><a target="_blank" title="MariaDB 10.0" href="https://github.com/cytopia/docker-mariadb-10.0">10.0</a></td>
231-
<td><a target="_blank" title="PerconaDB 5.6" href="https://github.com/cytopia/docker-percona-5.6">5.6</a></td>
229+
<td><a target="_blank" title="MySQL 5.6" href="https://github.com/devilbox/docker-mysql">5.6</a></td>
230+
<td><a target="_blank" title="MariaDB 10.0" href="https://github.com/devilbox/docker-mysql">10.0</a></td>
231+
<td><a target="_blank" title="PerconaDB 5.6" href="https://github.com/devilbox/docker-mysql">5.6</a></td>
232232
<td><a target="_blank" title="PgSQL 9.1" href="https://github.com/docker-library/postgres">9.1</a></td>
233233
<td><a target="_blank" title="Redis 3.0" href="https://github.com/docker-library/redis">3.0</a></td>
234234
<td><a target="_blank" title="Memcached 1.5" href="https://github.com/docker-library/memcached">1.5</a></td>
@@ -238,9 +238,9 @@ Every single attachable container comes with many different versions. In order t
238238
<td></td>
239239
<td></td>
240240
<td><a target="_blank" title="PHP 5.4" href="https://github.com/devilbox/docker-php-fpm">5.4</a></td>
241-
<td><a target="_blank" title="MySQL 5.7" href="https://github.com/cytopia/docker-mysql-5.7">5.7</a></td>
242-
<td><a target="_blank" title="MariaDB 10.1" href="https://github.com/cytopia/docker-mariadb-10.1">10.1</a></td>
243-
<td><a target="_blank" title="PerconaDB 5.7" href="https://github.com/cytopia/docker-percona-5.7">5.7</a></td>
241+
<td><a target="_blank" title="MySQL 5.7" href="https://github.com/devilbox/docker-mysql">5.7</a></td>
242+
<td><a target="_blank" title="MariaDB 10.1" href="https://github.com/devilbox/docker-mysql">10.1</a></td>
243+
<td><a target="_blank" title="PerconaDB 5.7" href="https://github.com/devilbox/docker-mysql">5.7</a></td>
244244
<td><a target="_blank" title="PgSQL 9.2" href="https://github.com/docker-library/postgres">9.2</a></td>
245245
<td><a target="_blank" title="Redis 3.2" href="https://github.com/docker-library/redis">3.2</a></td>
246246
<td><a target="_blank" title="Memcached latest" href="https://github.com/docker-library/memcached">latest</a></td>
@@ -250,9 +250,9 @@ Every single attachable container comes with many different versions. In order t
250250
<td></td>
251251
<td></td>
252252
<td><a target="_blank" title="PHP 5.5" href="https://github.com/devilbox/docker-php-fpm">5.5</a></td>
253-
<td><a target="_blank" title="MySQL 8.0" href="https://github.com/cytopia/docker-mysql-8.0">8.0</a></td>
254-
<td><a target="_blank" title="MariaDB 10.2" href="https://github.com/cytopia/docker-mariadb-10.2">10.2</a></td>
255-
<td></td>
253+
<td><a target="_blank" title="MySQL 8.0" href="https://github.com/devilbox/docker-mysql">8.0</a></td>
254+
<td><a target="_blank" title="MariaDB 10.2" href="https://github.com/devilbox/docker-mysql">10.2</a></td>
255+
<td><a target="_blank" title="PerconaDB 8.0" href="https://github.com/devilbox/docker-mysql">8.0</a></td>
256256
<td><a target="_blank" title="PgSQL 9.3" href="https://github.com/docker-library/postgres">9.3</a></td>
257257
<td><a target="_blank" title="Redis 4.0" href="https://github.com/docker-library/redis">4.0</a></td>
258258
<td></td>
@@ -263,7 +263,7 @@ Every single attachable container comes with many different versions. In order t
263263
<td></td>
264264
<td><a target="_blank" title="PHP 5.6" href="https://github.com/devilbox/docker-php-fpm">5.6</a></td>
265265
<td></td>
266-
<td><a target="_blank" title="MariaDB 10.3" href="https://github.com/cytopia/docker-mariadb-10.3">10.3</a></td>
266+
<td><a target="_blank" title="MariaDB 10.3" href="https://github.com/devilbox/docker-mysql">10.3</a></td>
267267
<td></td>
268268
<td><a target="_blank" title="PgSQL 9.4" href="https://github.com/docker-library/postgres">9.4</a></td>
269269
<td><a target="_blank" title="Redis 5.0" href="https://github.com/docker-library/redis">5.0</a></td>
@@ -275,7 +275,7 @@ Every single attachable container comes with many different versions. In order t
275275
<td></td>
276276
<td><a target="_blank" title="PHP 7.0" href="https://github.com/devilbox/docker-php-fpm">7.0</a></td>
277277
<td></td>
278-
<td></td>
278+
<td><a target="_blank" title="MariaDB 10.4" href="https://github.com/devilbox/docker-mysql">10.4</a></td>
279279
<td></td>
280280
<td><a target="_blank" title="PgSQL 9.5" href="https://github.com/docker-library/postgres">9.5</a></td>
281281
<td><a target="_blank" title="Redis latest" href="https://github.com/docker-library/redis">latest</a></td>

‎.devilbox/etc/mariadb-10.0/.keepme ‎cfg/mariadb-10.4/.keepme

File renamed without changes.

‎cfg/mariadb-10.4/devilbox-custom.cnf-example

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[mysqld]
2+
;key_buffer_size=16M
3+
4+
[mysqldump]
5+
;quick

‎.devilbox/etc/mariadb-10.1/.keepme ‎cfg/percona-8.0/.keepme

File renamed without changes.

‎cfg/percona-8.0/devilbox-custom.cnf-example

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[mysqld]
2+
;key_buffer_size=16M
3+
4+
[mysqldump]
5+
;quick

‎docker-compose.yml

+5-38
Original file line numberDiff line numberDiff line change
@@ -309,35 +309,12 @@ services:
309309
# MySQL Database
310310
# ------------------------------------------------------------
311311
mysql:
312-
image: cytopia/${MYSQL_SERVER}:latest
312+
image: devilbox/mysql:${MYSQL_SERVER}
313313
hostname: mysql
314314

315315
environment:
316-
317-
##
318-
## Debug?
319-
##
320-
- DEBUG_COMPOSE_ENTRYPOINT
321-
322-
##
323-
## Adjust timezone
324-
##
325-
- TIMEZONE
326-
327-
##
328-
## Adjust Root password
329-
##
330316
- MYSQL_ROOT_PASSWORD
331-
332-
##
333-
## Socket directory Path
334-
##
335-
- MYSQL_SOCKET_DIR=/tmp/mysql
336-
337-
##
338-
## Runtime settings
339-
##
340-
- MYSQL_GENERAL_LOG=${MYSQL_GENERAL_LOG}
317+
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
341318

342319
ports:
343320
# [local-machine:]local-port:docker-port
@@ -351,12 +328,6 @@ services:
351328
# ---- Format: ----
352329
# HOST-DIRECTORY : DOCKER-DIRECTORY
353330

354-
# Mount logs
355-
- ${DEVILBOX_PATH}/log/${MYSQL_SERVER}:/var/log/mysql:rw${MOUNT_OPTIONS}
356-
357-
# Mount devilbox default overwrites
358-
- ${DEVILBOX_PATH}/.devilbox/etc/${MYSQL_SERVER}:/etc/mysql/conf.d:ro${MOUNT_OPTIONS}
359-
360331
# Mount devilbox user-defined cnf files in order
361332
# to overwrite the MySQL server configuration
362333
- ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/docker-default.d:ro${MOUNT_OPTIONS}
@@ -427,13 +398,6 @@ services:
427398
app_net:
428399
ipv4_address: 172.16.238.14
429400

430-
volumes:
431-
# ---- Format: ----
432-
# HOST-DIRECTORY : DOCKER-DIRECTORY
433-
434-
# Mount logs
435-
- ${DEVILBOX_PATH}/log/redis-${REDIS_SERVER}:/var/log/redis:rw${MOUNT_OPTIONS}
436-
437401
depends_on:
438402
- bind
439403
- php
@@ -510,6 +474,7 @@ networks:
510474
- subnet: 172.16.238.0/24
511475
gateway: 172.16.238.1
512476

477+
513478
################################################################################
514479
# VOLUMES
515480
################################################################################
@@ -531,9 +496,11 @@ volumes:
531496
devilbox-mariadb-10.1:
532497
devilbox-mariadb-10.2:
533498
devilbox-mariadb-10.3:
499+
devilbox-mariadb-10.4:
534500
devilbox-percona-5.5:
535501
devilbox-percona-5.6:
536502
devilbox-percona-5.7:
503+
devilbox-percona-8.0:
537504

538505
# ------------------------------------------------------------
539506
# Postgres

0 commit comments

Comments
 (0)