From owner-svn-ports-all@freebsd.org  Tue Jun  6 03:44:37 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 862B7BEF89B;
 Tue,  6 Jun 2017 03:44:37 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 560FD7B7FF;
 Tue,  6 Jun 2017 03:44:37 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v563ia35072718;
 Tue, 6 Jun 2017 03:44:36 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v563iaTo072716;
 Tue, 6 Jun 2017 03:44:36 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201706060344.v563iaTo072716@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 6 Jun 2017 03:44:36 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2017 03:44:37 -0000

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'