Skip to content

Add custom docker-compose container name for v2 fix #204

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add custom docker-compose container name for v2 fix #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
82 changes: 44 additions & 38 deletions src/Site_WP_Docker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,35 +40,37 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {

if ( in_array( 'db', $filters, true ) ) {
// db configuration.
$db['service_name'] = [ 'name' => 'db' ];
$db['image'] = [ 'name' => 'easyengine/mariadb:' . $img_versions['easyengine/mariadb'] ];
$db['restart'] = $restart_default;
$db['labels'] = [
$db['service_name'] = [ 'name' => 'db' ];
$db['container_name'] = $filters['site_prefix'] . '_db_1';
$db['image'] = [ 'name' => 'easyengine/mariadb:' . $img_versions['easyengine/mariadb'] ];
$db['restart'] = $restart_default;
$db['labels'] = [
'label' => [
'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
],
];
$db['volumes'] = [
$db['volumes'] = [
[
'vol' => \EE_DOCKER::get_mounting_volume_array( $volumes['db'] ),
],
];
$db['environment'] = [
$db['environment'] = [
'env' => [
[ 'name' => 'MYSQL_ROOT_PASSWORD' ],
[ 'name' => 'MYSQL_DATABASE' ],
[ 'name' => 'MYSQL_USER' ],
[ 'name' => 'MYSQL_PASSWORD' ],
],
];
$db['sysctls'] = sysctl_parameters();
$db['networks'] = $network_default;
$db['sysctls'] = sysctl_parameters();
$db['networks'] = $network_default;
}
// PHP configuration.
$php_image_key = ( 'latest' === $filters['php_version'] ? 'easyengine/php' : 'easyengine/php' . $filters['php_version'] );

$php['service_name'] = [ 'name' => 'php' ];
$php['image'] = [ 'name' => $php_image_key . ':' . $img_versions[ $php_image_key ] ];
$php['service_name'] = [ 'name' => 'php' ];
$php['container_name'] = $filters['site_prefix'] . '_php_1';
$php['image'] = [ 'name' => $php_image_key . ':' . $img_versions[ $php_image_key ] ];

if ( in_array( 'db', $filters, true ) ) {
$php['depends_on']['dependency'][] = [ 'name' => 'db' ];
Expand All @@ -78,18 +80,18 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
$php['depends_on']['dependency'][] = [ 'name' => 'redis' ];
}

$php['restart'] = $restart_default;
$php['labels'] = [
$php['restart'] = $restart_default;
$php['labels'] = [
'label' => [
'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
],
];
$php['volumes'] = [
$php['volumes'] = [
[
'vol' => \EE_DOCKER::get_mounting_volume_array( $volumes['php'] ),
],
];
$php['environment'] = [
$php['environment'] = [
'env' => [
[ 'name' => 'WORDPRESS_DB_HOST' ],
[ 'name' => 'WORDPRESS_DB_NAME' ],
Expand All @@ -103,9 +105,9 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
],
];

$php['sysctls'] = sysctl_parameters();
$php['sysctls'] = sysctl_parameters();

$php['networks'] = [
$php['networks'] = [
'net' => [
[
'name' => 'site-network',
Expand All @@ -126,6 +128,7 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {

// nginx configuration.
$nginx['service_name'] = [ 'name' => 'nginx' ];
$nginx['container_name'] = $filters['site_prefix'] . '_nginx_1';
$nginx['image'] = [ 'name' => 'easyengine/nginx:' . $img_versions['easyengine/nginx'] ];
$nginx['depends_on']['dependency'][] = [ 'name' => 'php' ];
$nginx['restart'] = $restart_default;
Expand All @@ -137,7 +140,7 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
$v_host = in_array( 'subdom', $filters, true ) ? 'VIRTUAL_HOST=${VIRTUAL_HOST},*.${VIRTUAL_HOST}' : 'VIRTUAL_HOST';
}

$nginx['environment'] = [
$nginx['environment'] = [
'env' => [
[ 'name' => $v_host ],
[ 'name' => 'VIRTUAL_PATH=/' ],
Expand All @@ -156,18 +159,18 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
$nginx['environment']['env'][] = [ 'name' => "SSL_POLICY=$ssl_policy" ];
}

$nginx['volumes'] = [
$nginx['volumes'] = [
'vol' => \EE_DOCKER::get_mounting_volume_array( $volumes['nginx'] ),
];
$nginx['labels'] = [
$nginx['labels'] = [
'label' => [
'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
],
];

$nginx['sysctls'] = sysctl_parameters();
$nginx['sysctls'] = sysctl_parameters();

$nginx['networks'] = [
$nginx['networks'] = [
'net' => [
[ 'name' => 'global-frontend-network' ],
[ 'name' => 'site-network' ],
Expand All @@ -179,48 +182,51 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
}

// mailhog configuration.
$mailhog['service_name'] = [ 'name' => 'mailhog' ];
$mailhog['image'] = [ 'name' => 'easyengine/mailhog:' . $img_versions['easyengine/mailhog'] ];
$mailhog['restart'] = $restart_default;
$mailhog['command'] = [ 'name' => '["-invite-jim=false"]' ];
$mailhog['environment'] = [
$mailhog['service_name'] = [ 'name' => 'mailhog' ];
$mailhog['container_name'] = $filters['site_prefix'] . '_mailhog_1';
$mailhog['image'] = [ 'name' => 'easyengine/mailhog:' . $img_versions['easyengine/mailhog'] ];
$mailhog['restart'] = $restart_default;
$mailhog['command'] = [ 'name' => '["-invite-jim=false"]' ];
$mailhog['environment'] = [
'env' => [
[ 'name' => $v_host ],
[ 'name' => 'VIRTUAL_PATH=/ee-admin/mailhog/' ],
[ 'name' => 'VIRTUAL_PORT=8025' ],
],
];
$mailhog['labels'] = [
$mailhog['labels'] = [
'label' => [
'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
],
];
$mailhog['networks'] = [
$mailhog['networks'] = [
'net' => [
[ 'name' => 'site-network' ],
[ 'name' => 'global-frontend-network' ],
],
];

// postfix configuration.
$postfix['service_name'] = [ 'name' => 'postfix' ];
$postfix['image'] = [ 'name' => 'easyengine/postfix:' . $img_versions['easyengine/postfix'] ];
$postfix['hostname'] = [ 'name' => '${VIRTUAL_HOST}' ];
$postfix['restart'] = $restart_default;
$postfix['labels'] = [
$postfix['service_name'] = [ 'name' => 'postfix' ];
$postfix['container_name'] = $filters['site_prefix'] . '_postfix_1';
$postfix['image'] = [ 'name' => 'easyengine/postfix:' . $img_versions['easyengine/postfix'] ];
$postfix['hostname'] = [ 'name' => '${VIRTUAL_HOST}' ];
$postfix['restart'] = $restart_default;
$postfix['labels'] = [
'label' => [
'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
],
];
$postfix['volumes'] = [
$postfix['volumes'] = [
'vol' => \EE_DOCKER::get_mounting_volume_array( $volumes['postfix'] ),
];
$postfix['networks'] = $network_default;
$postfix['networks'] = $network_default;

// redis configuration.
$redis['service_name'] = [ 'name' => 'redis' ];
$redis['image'] = [ 'name' => 'easyengine/redis:' . $img_versions['easyengine/redis'] ];
$redis['labels'] = [
$redis['service_name'] = [ 'name' => 'redis' ];
$redis['container_name'] = $filters['site_prefix'] . '_redis_1';
$redis['image'] = [ 'name' => 'easyengine/redis:' . $img_versions['easyengine/redis'] ];
$redis['labels'] = [
'label' => [
'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
],
Expand Down
3 changes: 3 additions & 0 deletions templates/docker-compose.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ services:
{{#service_name}}
{{name}}:
{{/service_name}}
{{#container_name}}
container_name: {{container_name}}
{{/container_name}}
{{#image}}
image: {{name}}
{{/image}}
Expand Down