From 37cd42905832c678bdd5f63fd4ce470c6998db3e Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Mon, 27 Feb 2017 16:57:07 -0300 Subject: [PATCH] Add default gitconfig --- .gitconfig | 2 ++ Dockerfile.dind | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..87b8f9b --- /dev/null +++ b/.gitconfig @@ -0,0 +1,2 @@ +[url "https://"] + insteadOf = git:// diff --git a/Dockerfile.dind b/Dockerfile.dind index 9332f95..8f03635 100644 --- a/Dockerfile.dind +++ b/Dockerfile.dind @@ -1,6 +1,6 @@ FROM docker:1.13.1-dind -RUN apk add --no-cache git tmux py2-pip apache2-utils vim build-base gettext-dev curl bash +RUN apk add --no-cache git tmux py2-pip apache2-utils vim build-base gettext-dev curl bash util-linux ENV COMPOSE_VERSION=1.11.1 # Install Compose and Machine @@ -22,7 +22,7 @@ RUN rm /sbin/modprobe && echo '#!/bin/true' >/sbin/modprobe && chmod +x /sbin/mo # Install a nice vimrc file and prompt (by soulshake) COPY ["docker-prompt","/usr/local/bin/"] -COPY [".vimrc",".bashrc", ".inputrc", "./root/"] +COPY [".vimrc",".bashrc", ".inputrc", ".gitconfig", "./root/"] ARG docker_storage_driver=overlay2 @@ -34,7 +34,8 @@ WORKDIR /root # Remove IPv6 alias for localhost and start docker in the background ... CMD cat /etc/hosts >/etc/hosts.bak && \ sed 's/^::1.*//' /etc/hosts.bak > /etc/hosts && \ + umount /var/lib/docker && \ dockerd --experimental -g /graph --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 \ --storage-driver=$DOCKER_STORAGE_DRIVER --dns $PWD_IP_ADDRESS --dns 8.8.8.8 &>/docker.log & \ - while true ; do /bin/bash ; done + while true ; do script -q -c /bin/bash /dev/null ; done # ... and then put a shell in the foreground, restarting it if it exits