← Back to team overview

bind-charmers team mailing list archive

Re: [Merge] ~barryprice/charm-k8s-bind/+git/bind-k8s-image-builder:master into ~bind-charmers/charm-k8s-bind/+git/bind-k8s-image-builder:master

 

Drive by...

Diff comments:

> diff --git a/files/docker-entrypoint.sh b/files/docker-entrypoint.sh
> new file mode 100644
> index 0000000..d73dc1a
> --- /dev/null
> +++ b/files/docker-entrypoint.sh
> @@ -0,0 +1,18 @@
> +#!/bin/bash
> +set -eu
> +
> +if [ -z $CUSTOM_CONFIG_REPO ];
> +then

Move then to previously line - i.e. 'if ... ; then'

> +	echo "No custom repo set, will fall back to package default config"
> +elif [ -z $BIND_CONFDIR ];
> +	BIND_CONFDIR="/etc/bind"
> +else
> +	echo "Pulling config from $CUSTOM_CONFIG_REPO"
> +	if [ -d /etc/bind ];
> +	then

Ditto

> +		mv /etc/bind /etc/bind_$(date +"%Y-%m-%d_%H-%M-%S");
> +	fi
> +	git clone $CUSTOM_CONFIG_REPO $BIND_CONFDIR
> +fi
> +
> +exec "$@"


-- 
https://code.launchpad.net/~barryprice/charm-k8s-bind/+git/bind-k8s-image-builder/+merge/387800
Your team Bind Charmers is requested to review the proposed merge of ~barryprice/charm-k8s-bind/+git/bind-k8s-image-builder:master into ~bind-charmers/charm-k8s-bind/+git/bind-k8s-image-builder:master.


References