waz0196

Using DiffMerge as your git mergetool (for Mac OS X / macOS)

Reference(s):

Step 1: download and install the DiffMerge OS X Installer

http://www.sourcegear.com/diffmerge/downloads.php - get the installer version, NOT the dmg version

Experimental Docker Libnetwork DHCP Driver

The DHCP driver is intended for users to be able to integrate Docker IP address management with their existing IPAM strategies that use DHCP for dynamic address assignment. DHCP enables users to allocate addresses in an organized fashion that will prevent overlapping IP address assignment by associating a unique MAC address from the container eth0 Ethernet interface to an IP address as determined by the DHCP pools defined in the DHCP configuration.

This driver only provides the DHCP client functionality. It does not include a DHCP server. The default driver offers single-host IPAM or for distributed multi-host orchestrated IPAM see the libnetwork overlay driver.

Getting Started

Download the driver compiled into Docker Engine - docker binary with libnetwork test dhcp client spam driver

	Step by step how to pull a private DockerHub hosted image in a Kubernetes YML.

	export DOCKER_REGISTRY_SERVER=https://index.docker.io/v1/
	export DOCKER_USER=Type your dockerhub username, same as when you `docker login`
	export DOCKER_EMAIL=Type your dockerhub email, same as when you `docker login`
	export DOCKER_PASSWORD=Type your dockerhub pw, same as when you `docker login`

	kubectl create secret docker-registry myregistrykey \
	--docker-server=$DOCKER_REGISTRY_SERVER \
	--docker-username=$DOCKER_USER \

	Install http://download-us.sourcegear.com/DiffMerge/4.2.0/DiffMerge_4.2.0.697.stable_x64.msi

	// this is an adaptation of http://adventuresincoding.com/2010/04/how-to-setup-git-to-use-diffmerge

	Then run the following commands from the git bash

	git config --global merge.tool diffmerge

	git config --global mergetool.diffmerge.cmd "sgdm --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE"