Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Devilbox Release v1.0.0 #416

Merged
merged 11 commits into from
Mar 19, 2019
Merged

Devilbox Release v1.0.0 #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ba3dd31
Refs #175, Refs #382 Use Docker volumes instead of data directories
cytopia Sep 22, 2018
bb1b72d
Ensure default values are used for mounted data directories as well
cytopia Sep 22, 2018
c6542ad
Update container versions
cytopia Sep 22, 2018
c582163
Remove unecessary data dirs
cytopia Oct 10, 2018
f19a5d2
Ensure mail uses a Docker volume
cytopia Nov 17, 2018
ef2f39f
Clean up docker-compose.yml
cytopia Feb 6, 2019
cfba16f
Restore failed rebase
cytopia Feb 28, 2019
1138c49
Update CHANGELOG
cytopia Mar 9, 2019
9e3da94
Prepare Devilbox v1.0.0 release
cytopia Mar 18, 2019
2b521c9
Remove migration announcement
cytopia Mar 18, 2019
c2b8a53
#500 docs troubleshooting mysql
cytopia Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed .devilbox/etc/mariadb-10.2/.keepme
View file
Open in desktop
Empty file.
Empty file removed .devilbox/etc/mariadb-10.3/.keepme
View file
Open in desktop
Empty file.
Empty file removed .devilbox/etc/mariadb-5.5/.keepme
View file
Open in desktop
Empty file.
Empty file removed .devilbox/etc/mysql-5.5/.keepme
View file
Open in desktop
Empty file.
Empty file removed .devilbox/etc/mysql-5.6/.keepme
View file
Open in desktop
Empty file.
Empty file removed .devilbox/etc/mysql-5.7/.keepme
View file
Open in desktop
Empty file.
Empty file removed .devilbox/etc/mysql-8.0/.keepme
View file
Open in desktop
Empty file.
10 changes: 0 additions & 10 deletions .devilbox/etc/mysql-8.0/charset.cnf
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .devilbox/www/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');


$DEVILBOX_VERSION = 'v0.15.0';
$DEVILBOX_VERSION = 'v1.0.0';
$DEVILBOX_DATE = '2019-03-18';
$DEVILBOX_API_PAGE = 'devilbox-api/status.json';

Expand Down
6 changes: 3 additions & 3 deletions .devilbox/www/htdocs/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,14 +679,14 @@
<?php if ($avail_mysql): ?>
<tr>
<th>mysql</th>
<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_MYSQL_DATADIR').'/'.loadClass('Helper')->getEnv('MYSQL_SERVER'); ?></td>
<td>Docker volume</td>
<td>/var/lib/mysql</td>
</tr>
<?php endif; ?>
<?php if ($avail_pgsql): ?>
<tr>
<th>pgsql</th>
<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_PGSQL_DATADIR').'/'.loadClass('Helper')->getEnv('PGSQL_SERVER'); ?></td>
<td>Docker volume</td>
<td>/var/lib/postgresql/data/pgdata</td>
</tr>
<?php endif; ?>
Expand All @@ -707,7 +707,7 @@
<?php if ($avail_mongo): ?>
<tr>
<th>mongo</th>
<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_MONGO_DATADIR'); ?></td>
<td>Docker volume</td>
<td>/data/db</td>
</tr>
<?php endif; ?>
Expand Down
7 changes: 3 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
/log/[a-z0-9-]*

# Ignore Data dirs
/data/mongo/*
/data/mysql/*
/data/pgsql/*
/data/rabbit/*
/data/www/*

# Ignore Certificate Authority
Expand Down Expand Up @@ -51,9 +47,12 @@
/cfg/mariadb-10.0/*.cnf
/cfg/mariadb-10.1/*.cnf
/cfg/mariadb-10.2/*.cnf
/cfg/mariadb-10.3/*.cnf
/cfg/mariadb-10.4/*.cnf
/cfg/percona-5.5/*.cnf
/cfg/percona-5.6/*.cnf
/cfg/percona-5.7/*.cnf
/cfg/percona-8.0/*.cnf

# Ignore custom PHP.ini configs
/cfg/php-ini-5.2/*.ini
Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,12 @@ env:
- S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.0
- S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.1
- S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.2
- S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.3
- S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.4
- S1=PHP V1=7.2 S2=MYSQL V2=percona-5.5
- S1=PHP V1=7.2 S2=MYSQL V2=percona-5.6
- S1=PHP V1=7.2 S2=MYSQL V2=percona-5.7
- S1=PHP V1=7.2 S2=MYSQL V2=percona-8.0
# PHP 7.2 vs PgSQL
- S1=PHP V1=7.2 S2=PGSQL V2=9.0
- S1=PHP V1=7.2 S2=PGSQL V2=9.1
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,20 @@ major versions.
- This fixes various issues with Docker Toolbox and DNS resolution: #119


## v1.0.0-alpha1 [unreleased]
## v1.0.0

#### Changed
- Everything from v1.0.0-alpha1 has been backported
- Everything from v0.15.0 has been backported


## v1.0.0-alpha1

#### Changed
- Use Docker volumes instead of directory mounts for stateful data (MySQL, PgSQL and MongoDB)
- This fixes various mount issues on Windows: #175 #382
- This improves general performance
- Use Official MySQL, MariaDB and Percona Docker container


## v0.15.0
Expand Down
28 changes: 14 additions & 14 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ Every single attachable container comes with many different versions. In order t
<td><a target="_blank" title="Apache 2.2" href="https://github.com/devilbox/docker-apache-2.2">2.2</a></td>
<td><a target="_blank" title="Nginx stable" href="https://github.com/devilbox/docker-nginx-stable">stable</a></td>
<td><a target="_blank" title="PHP 5.2" href="https://github.com/devilbox/docker-php-fpm">5.2</a><sup>[1]</sup></td>
<td><a target="_blank" title="MySQL 5.5" href="https://github.com/cytopia/docker-mysql-5.5">5.5</a></td>
<td><a target="_blank" title="MariaDB 5.5" href="https://github.com/cytopia/docker-mariadb-5.5">5.5</a></td>
<td><a target="_blank" title="PerconaDB 5.5" href="https://github.com/cytopia/docker-percona-5.5">5.5</a></td>
<td><a target="_blank" title="MySQL 5.5" href="https://github.com/devilbox/docker-mysql">5.5</a></td>
<td><a target="_blank" title="MariaDB 5.5" href="https://github.com/devilbox/docker-mysql">5.5</a></td>
<td><a target="_blank" title="PerconaDB 5.5" href="https://github.com/devilbox/docker-mysql">5.5</a></td>
<td><a target="_blank" title="PgSQL 9.0" href="https://github.com/docker-library/postgres">9.0</a></td>
<td><a target="_blank" title="Redis 2.8" href="https://github.com/docker-library/redis">2.8</a></td>
<td><a target="_blank" title="Memcached 1.4" href="https://github.com/docker-library/memcached">1.4</a></td>
Expand All @@ -226,9 +226,9 @@ Every single attachable container comes with many different versions. In order t
<td><a target="_blank" title="Apache 2.4" href="https://github.com/devilbox/docker-apache-2.4">2.4</a></td>
<td><a target="_blank" title="Nginx mainline" href="https://github.com/devilbox/docker-nginx-mainline">mainline</a></td>
<td><a target="_blank" title="PHP 5.3" href="https://github.com/devilbox/docker-php-fpm">5.3</a></td>
<td><a target="_blank" title="MySQL 5.6" href="https://github.com/cytopia/docker-mysql-5.6">5.6</a></td>
<td><a target="_blank" title="MariaDB 10.0" href="https://github.com/cytopia/docker-mariadb-10.0">10.0</a></td>
<td><a target="_blank" title="PerconaDB 5.6" href="https://github.com/cytopia/docker-percona-5.6">5.6</a></td>
<td><a target="_blank" title="MySQL 5.6" href="https://github.com/devilbox/docker-mysql">5.6</a></td>
<td><a target="_blank" title="MariaDB 10.0" href="https://github.com/devilbox/docker-mysql">10.0</a></td>
<td><a target="_blank" title="PerconaDB 5.6" href="https://github.com/devilbox/docker-mysql">5.6</a></td>
<td><a target="_blank" title="PgSQL 9.1" href="https://github.com/docker-library/postgres">9.1</a></td>
<td><a target="_blank" title="Redis 3.0" href="https://github.com/docker-library/redis">3.0</a></td>
<td><a target="_blank" title="Memcached 1.5" href="https://github.com/docker-library/memcached">1.5</a></td>
Expand All @@ -238,9 +238,9 @@ Every single attachable container comes with many different versions. In order t
<td></td>
<td></td>
<td><a target="_blank" title="PHP 5.4" href="https://github.com/devilbox/docker-php-fpm">5.4</a></td>
<td><a target="_blank" title="MySQL 5.7" href="https://github.com/cytopia/docker-mysql-5.7">5.7</a></td>
<td><a target="_blank" title="MariaDB 10.1" href="https://github.com/cytopia/docker-mariadb-10.1">10.1</a></td>
<td><a target="_blank" title="PerconaDB 5.7" href="https://github.com/cytopia/docker-percona-5.7">5.7</a></td>
<td><a target="_blank" title="MySQL 5.7" href="https://github.com/devilbox/docker-mysql">5.7</a></td>
<td><a target="_blank" title="MariaDB 10.1" href="https://github.com/devilbox/docker-mysql">10.1</a></td>
<td><a target="_blank" title="PerconaDB 5.7" href="https://github.com/devilbox/docker-mysql">5.7</a></td>
<td><a target="_blank" title="PgSQL 9.2" href="https://github.com/docker-library/postgres">9.2</a></td>
<td><a target="_blank" title="Redis 3.2" href="https://github.com/docker-library/redis">3.2</a></td>
<td><a target="_blank" title="Memcached latest" href="https://github.com/docker-library/memcached">latest</a></td>
Expand All @@ -250,9 +250,9 @@ Every single attachable container comes with many different versions. In order t
<td></td>
<td></td>
<td><a target="_blank" title="PHP 5.5" href="https://github.com/devilbox/docker-php-fpm">5.5</a></td>
<td><a target="_blank" title="MySQL 8.0" href="https://github.com/cytopia/docker-mysql-8.0">8.0</a></td>
<td><a target="_blank" title="MariaDB 10.2" href="https://github.com/cytopia/docker-mariadb-10.2">10.2</a></td>
<td></td>
<td><a target="_blank" title="MySQL 8.0" href="https://github.com/devilbox/docker-mysql">8.0</a></td>
<td><a target="_blank" title="MariaDB 10.2" href="https://github.com/devilbox/docker-mysql">10.2</a></td>
<td><a target="_blank" title="PerconaDB 8.0" href="https://github.com/devilbox/docker-mysql">8.0</a></td>
<td><a target="_blank" title="PgSQL 9.3" href="https://github.com/docker-library/postgres">9.3</a></td>
<td><a target="_blank" title="Redis 4.0" href="https://github.com/docker-library/redis">4.0</a></td>
<td></td>
Expand All @@ -263,7 +263,7 @@ Every single attachable container comes with many different versions. In order t
<td></td>
<td><a target="_blank" title="PHP 5.6" href="https://github.com/devilbox/docker-php-fpm">5.6</a></td>
<td></td>
<td><a target="_blank" title="MariaDB 10.3" href="https://github.com/cytopia/docker-mariadb-10.3">10.3</a></td>
<td><a target="_blank" title="MariaDB 10.3" href="https://github.com/devilbox/docker-mysql">10.3</a></td>
<td></td>
<td><a target="_blank" title="PgSQL 9.4" href="https://github.com/docker-library/postgres">9.4</a></td>
<td><a target="_blank" title="Redis 5.0" href="https://github.com/docker-library/redis">5.0</a></td>
Expand All @@ -275,7 +275,7 @@ Every single attachable container comes with many different versions. In order t
<td></td>
<td><a target="_blank" title="PHP 7.0" href="https://github.com/devilbox/docker-php-fpm">7.0</a></td>
<td></td>
<td></td>
<td><a target="_blank" title="MariaDB 10.4" href="https://github.com/devilbox/docker-mysql">10.4</a></td>
<td></td>
<td><a target="_blank" title="PgSQL 9.5" href="https://github.com/docker-library/postgres">9.5</a></td>
<td><a target="_blank" title="Redis latest" href="https://github.com/docker-library/redis">latest</a></td>
Expand Down
0 .devilbox/etc/mariadb-10.0/.keepme → cfg/mariadb-10.4/.keepme
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions cfg/mariadb-10.4/devilbox-custom.cnf-example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[mysqld]
;key_buffer_size=16M

[mysqldump]
;quick
0 .devilbox/etc/mariadb-10.1/.keepme → cfg/percona-8.0/.keepme
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions cfg/percona-8.0/devilbox-custom.cnf-example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[mysqld]
;key_buffer_size=16M

[mysqldump]
;quick
Empty file removed data/mongo/.keepme
View file
Open in desktop
Empty file.
Empty file removed data/mysql/.keepme
View file
Open in desktop
Empty file.
Empty file removed data/pgsql/.keepme
View file
Open in desktop
Empty file.
Empty file removed data/rabbit/.keepme
View file
Open in desktop
Empty file.
112 changes: 71 additions & 41 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,35 +309,12 @@ services:
# MySQL Database
# ------------------------------------------------------------
mysql:
image: cytopia/${MYSQL_SERVER}:latest
image: devilbox/mysql:${MYSQL_SERVER}
hostname: mysql

environment:

##
## Debug?
##
- DEBUG_COMPOSE_ENTRYPOINT

##
## Adjust timezone
##
- TIMEZONE

##
## Adjust Root password
##
- MYSQL_ROOT_PASSWORD

##
## Socket directory Path
##
- MYSQL_SOCKET_DIR=/tmp/mysql

##
## Runtime settings
##
- MYSQL_GENERAL_LOG=${MYSQL_GENERAL_LOG}
- MYSQL_ALLOW_EMPTY_PASSWORD=yes

ports:
# [local-machine:]local-port:docker-port
Expand All @@ -351,18 +328,12 @@ services:
# ---- Format: ----
# HOST-DIRECTORY : DOCKER-DIRECTORY

# Mount logs
- ${DEVILBOX_PATH}/log/${MYSQL_SERVER}:/var/log/mysql:rw${MOUNT_OPTIONS}

# Mount devilbox default overwrites
- ${DEVILBOX_PATH}/.devilbox/etc/${MYSQL_SERVER}:/etc/mysql/conf.d:ro${MOUNT_OPTIONS}

# Mount devilbox user-defined cnf files in order
# to overwrite the MySQL server configuration
- ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/docker-default.d:ro${MOUNT_OPTIONS}

# Mount MySQL Data directory
- ${HOST_PATH_MYSQL_DATADIR}/${MYSQL_SERVER}:/var/lib/mysql:rw${MOUNT_OPTIONS}
- devilbox-${MYSQL_SERVER}:/var/lib/mysql:rw${MOUNT_OPTIONS}

depends_on:
- bind
Expand Down Expand Up @@ -399,7 +370,7 @@ services:
- ${DEVILBOX_PATH}/log/pgsql-${PGSQL_SERVER}:/var/log/postgresql:rw${MOUNT_OPTIONS}

# Mount PostgreSQL Data directory
- ${HOST_PATH_PGSQL_DATADIR}/${PGSQL_SERVER}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}
- devilbox-pgsql-${PGSQL_SERVER}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}

depends_on:
- bind
Expand Down Expand Up @@ -427,13 +398,6 @@ services:
app_net:
ipv4_address: 172.16.238.14

volumes:
# ---- Format: ----
# HOST-DIRECTORY : DOCKER-DIRECTORY

# Mount logs
- ${DEVILBOX_PATH}/log/redis-${REDIS_SERVER}:/var/log/redis:rw${MOUNT_OPTIONS}

depends_on:
- bind
- php
Expand Down Expand Up @@ -488,7 +452,7 @@ services:
# HOST-DIRECTORY : DOCKER-DIRECTORY

# Mount MongoDB Data directory
- ${HOST_PATH_MONGO_DATADIR}/${MONGO_SERVER}:/data/db:rw${MOUNT_OPTIONS}
- devilbox-mongo-${MONGO_SERVER}:/data/db:rw${MOUNT_OPTIONS}

depends_on:
- bind
Expand All @@ -510,6 +474,7 @@ networks:
- subnet: 172.16.238.0/24
gateway: 172.16.238.1


################################################################################
# VOLUMES
################################################################################
Expand All @@ -518,3 +483,68 @@ volumes:
# Misc
# ------------------------------------------------------------
devilbox-mail:

# ------------------------------------------------------------
# MySQL
# ------------------------------------------------------------
devilbox-mysql-5.5:
devilbox-mysql-5.6:
devilbox-mysql-5.7:
devilbox-mysql-8.0:
devilbox-mariadb-5.5:
devilbox-mariadb-10.0:
devilbox-mariadb-10.1:
devilbox-mariadb-10.2:
devilbox-mariadb-10.3:
devilbox-mariadb-10.4:
devilbox-percona-5.5:
devilbox-percona-5.6:
devilbox-percona-5.7:
devilbox-percona-8.0:

# ------------------------------------------------------------
# Postgres
# ------------------------------------------------------------
devilbox-pgsql-9.0:
devilbox-pgsql-9.1:
devilbox-pgsql-9.2:
devilbox-pgsql-9.2-alpine:
devilbox-pgsql-9.3:
devilbox-pgsql-9.3-alpine:
devilbox-pgsql-9.4:
devilbox-pgsql-9.4-alpine:
devilbox-pgsql-9.5:
devilbox-pgsql-9.5-alpine:
devilbox-pgsql-9.6:
devilbox-pgsql-9.6-alpine:
devilbox-pgsql-10.0:
devilbox-pgsql-10.0-alpine:
devilbox-pgsql-10.1:
devilbox-pgsql-10.1-alpine:
devilbox-pgsql-10.2:
devilbox-pgsql-10.2-alpine:
devilbox-pgsql-10.3:
devilbox-pgsql-10.3-alpine:
devilbox-pgsql-10.4:
devilbox-pgsql-10.4-alpine:
devilbox-pgsql-10.5:
devilbox-pgsql-10.5-alpine:
devilbox-pgsql-10.6:
devilbox-pgsql-10.6-alpine:
devilbox-pgsql-11.0:
devilbox-pgsql-11.0-alpine:
devilbox-pgsql-11.1:
devilbox-pgsql-11.1-alpine:
devilbox-pgsql-latest:
devilbox-pgsql-alpine:

# ------------------------------------------------------------
# MongoDB
# ------------------------------------------------------------
devilbox-mongo-2.8:
devilbox-mongo-3.0:
devilbox-mongo-3.2:
devilbox-mongo-3.4:
devilbox-mongo-3.6:
devilbox-mongo-4.0:
devilbox-mongo-latest:
7 changes: 0 additions & 7 deletions docs/_includes/snippets/__ANNOUNCEMENTS__.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +0,0 @@
.. raw:: html

<div style="background-color:#dddcb7; border: 3px solid #DA111A; padding:10px 20px; margin-bottom:20px;">
<h1 style="margin-bottom:15px;">Important Announcement</h1>
<p style="margin:5px;">Everybody is strongly encouraged to switch to the upcoming v1.0.0 release version to prevent unforseen issues upon merge to master.</p>
<p style="margin:5px;"><strong>Instructions here:</strong> <a target="_blank" href="https://github.com/cytopia/devilbox/pull/416">https://github.com/cytopia/devilbox/pull/416</a>.</p>
</div>
Loading