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

Add DOMAIN_NAME for networks #34

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add DOMAIN_NAME for networks #34

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c35054
:gift: #32 - Add DOMAIN_NAME for networks
Jean-Beru Oct 31, 2016
053e011
fix method name to call
mykiwi Apr 21, 2018
1f343f5
add check if no short network short name is found
mykiwi Apr 21, 2018
7743106
Merge pull request #1 from mykiwi-forks/domain-name-for-networks
Jean-Beru Apr 21, 2018
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
67 changes: 60 additions & 7 deletions src/Synchronizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ private function getHostsLines($container)
// Networks
if (isset($container['NetworkSettings']['Networks']) && is_array($container['NetworkSettings']['Networks'])) {
foreach ($container['NetworkSettings']['Networks'] as $networkName => $conf) {
preg_match(sprintf('/^%s_(.+)$/', $this->getProjectName($container)), $networkName, $matches);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it working with a container not created by docker compose ?
docker run ...

$networkShortName = isset($matches[1]) ? $matches[1] : null;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

                $networkShortName = isset($matches[1]) ? $matches[1] : 'default';

should allow to not require setting the name as DOMAIN_NAME=default:foo.bar if the default network is used.

$ip = $conf['IPAddress'];

$aliases = isset($conf['Aliases']) && is_array($conf['Aliases']) ? $conf['Aliases'] : [];
Expand All @@ -136,6 +138,12 @@ private function getHostsLines($container)
$hosts[] = $alias.'.'.$networkName;
}

foreach ($this->getAdditionalContainerHosts($container) as $host) {
if (preg_match('/^(.+):(.+)$/', $host, $matches) && $matches[1] === $networkShortName) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this check and not directly add the host in the array ?

$hosts[] = $matches[2];
}
}

$lines[$ip] = sprintf('%s%s', isset($lines[$ip]) ? $lines[$ip].' ' : '', implode(' ', $hosts));
}
}
Expand All @@ -148,22 +156,67 @@ private function getHostsLines($container)
}

/**
* @param Container $container
* @param array $container
*
* @return string
*/
private function getProjectName($container)
{
if (isset($container['Config']['Labels']['com.docker.compose.project'])) {
return $container['Config']['Labels']['com.docker.compose.project'];
}

return '';
}

/**
* @param array $container
*
* @return array
*/
private function getContainerHosts($container)
{
$hosts = [substr($container['Name'], 1).$this->tld];
return array_merge(
[substr($container['Name'], 1).$this->tld],
$this->getAdditionalContainerHosts($container)
);
}

/**
* @param array $container
*
* @return array
*/
private function getAdditionalContainerHosts($container)
{
$hosts = [];

$domainName = $this->getEnv($container, 'DOMAIN_NAME');
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to suggest that DOMAIN_NAME is not entirely correct name for what we want to achieve with this feature. "Domain" is rather HTTP concept, but host manager can be used also for database containers instead of port binding (so developer can connect to database with client by custom host, not by localhost with bound port).

if ($domainName) {
$hosts = array_merge($hosts, explode(',', $domainName));
}

return $hosts;
}

/**
* @param array $container
* @param string $name
* @param string $default
*
* @return string
*/
private function getEnv($container, $name, $default = null)
{
if (isset($container['Config']['Env']) && is_array($container['Config']['Env'])) {
$env = $container['Config']['Env'];
foreach (preg_grep('/DOMAIN_NAME=/', $env) as $row) {
$row = substr($row, strlen('DOMAIN_NAME='));
$hosts = array_merge($hosts, explode(',', $row));
foreach ($container['Config']['Env'] as $env) {
if (preg_match(sprintf('/^%s=(.*)$/', $name), $env, $matches)) {
return $matches[1];
}
}
}

return $hosts;
return $default;
}

/**
Expand Down