From ac3068fd7de678e4b1207b37b135a623da3da3e8 Mon Sep 17 00:00:00 2001 From: Jeff Puckett Date: Thu, 23 Mar 2017 21:54:39 +0000 Subject: [PATCH] add host port to intranet link --- .devilbox/www/htdocs/vhosts.php | 2 +- .devilbox/www/include/lib/Docker.php | 20 ++++++++++++++++++++ docker-compose.yml | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.devilbox/www/htdocs/vhosts.php b/.devilbox/www/htdocs/vhosts.php index df19fb6d..73ee36de 100644 --- a/.devilbox/www/htdocs/vhosts.php +++ b/.devilbox/www/htdocs/vhosts.php @@ -84,7 +84,7 @@ } else { el_valid.className += ' bg-success'; el_valid.innerHTML = 'OK'; - el_href.innerHTML = ''+vhost+'.getTld();?>'; + el_href.innerHTML = ''+vhost+'.getTld();?>'; } } }; diff --git a/.devilbox/www/include/lib/Docker.php b/.devilbox/www/include/lib/Docker.php index 4e5526eb..76f71eaf 100644 --- a/.devilbox/www/include/lib/Docker.php +++ b/.devilbox/www/include/lib/Docker.php @@ -124,6 +124,26 @@ class Docker return $this->_tld; } + /** + * Get HTTP port. + * + * @return string + */ + public function getPort() + { + $port = $this->getEnv('HOST_PORT_HTTPD'); + + if ( empty($port) ) { + return ''; + } + + if ( $port == 80 ) { + return ''; + } + + return ":$port"; + } + /********************************************************************************* * diff --git a/docker-compose.yml b/docker-compose.yml index 4b021273..cc933505 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -158,6 +158,7 @@ services: ## Additional variables needed by custom intranet ## - HOST_PATH_TO_WWW_DOCROOTS=${HOST_PATH_TO_WWW_DOCROOTS} + - HOST_PORT_HTTPD=${HOST_PORT_HTTPD} - HOST_PATH_TO_MYSQL_DATADIR=${HOST_PATH_TO_MYSQL_DATADIR} - HOST_PATH_TO_POSTGRES_DATADIR=${HOST_PATH_TO_POSTGRES_DATADIR} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}