Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Jun 2017 03:44:36 +0000 (UTC)
From:      Alan Somers <asomers@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r442739 - in head/sysutils/docker-freebsd: . files
Message-ID:  <201706060344.v563iaTo072716@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: asomers (src committer)
Date: Tue Jun  6 03:44:36 2017
New Revision: 442739
URL: https://svnweb.freebsd.org/changeset/ports/442739

Log:
  sysutils/docker-freebsd: add docker_flags to the rc script
  
  Add a docker_flags variable to the rc script that can be used to pass
  freeform options to the docker command.  I use it for the "-H" option.
  
  PR:		219795
  Approved by:	amutu@amutu.com (maintainer)
  Approved by:	brd (ports)

Modified:
  head/sysutils/docker-freebsd/Makefile
  head/sysutils/docker-freebsd/files/docker.in

Modified: head/sysutils/docker-freebsd/Makefile
==============================================================================
--- head/sysutils/docker-freebsd/Makefile	Tue Jun  6 03:06:05 2017	(r442738)
+++ head/sysutils/docker-freebsd/Makefile	Tue Jun  6 03:44:36 2017	(r442739)
@@ -3,6 +3,7 @@
 
 PORTNAME=	docker-freebsd
 PORTVERSION=	20150625
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	amutu@amutu.com

Modified: head/sysutils/docker-freebsd/files/docker.in
==============================================================================
--- head/sysutils/docker-freebsd/files/docker.in	Tue Jun  6 03:06:05 2017	(r442738)
+++ head/sysutils/docker-freebsd/files/docker.in	Tue Jun  6 03:44:36 2017	(r442739)
@@ -19,6 +19,7 @@ load_rc_config $name
 : ${docker_dir=/usr/docker}
 : ${docker_nat_pf=YES}
 : ${docker_nat_iface=NONE}
+: ${docker_flags=}
 
 docker_start()
 {
@@ -36,7 +37,7 @@ docker_start()
 	fi
 
 	echo "Starting docker..."
-	daemon -p /var/run/docker.pid ${command} -d -e jail -s zfs -g ${docker_dir} -D >/var/log/docker.log 2>/var/log/docker.log
+	daemon -p /var/run/docker.pid ${command} -d -e jail -s zfs -g ${docker_dir} -D ${docker_flags} >/var/log/docker.log 2>/var/log/docker.log
 
 	# Check for linux 64bit support and enable
 	kldstat | grep -q 'linux64'



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706060344.v563iaTo072716>