Merge pull request #2809 from oliw/oliverw/remove-aufs-2
Remove aufs step from Makefile
This commit is contained in:
7
Makefile
7
Makefile
@@ -137,7 +137,7 @@ sigil:
|
|||||||
wget -qO /tmp/sigil_latest.tgz ${SIGIL_URL}
|
wget -qO /tmp/sigil_latest.tgz ${SIGIL_URL}
|
||||||
tar xzf /tmp/sigil_latest.tgz -C /usr/local/bin
|
tar xzf /tmp/sigil_latest.tgz -C /usr/local/bin
|
||||||
|
|
||||||
docker: aufs
|
docker:
|
||||||
apt-get install -qq -y curl
|
apt-get install -qq -y curl
|
||||||
egrep -i "^docker" /etc/group || groupadd docker
|
egrep -i "^docker" /etc/group || groupadd docker
|
||||||
usermod -aG docker dokku
|
usermod -aG docker dokku
|
||||||
@@ -149,11 +149,6 @@ endif
|
|||||||
sleep 2 # give docker a moment i guess
|
sleep 2 # give docker a moment i guess
|
||||||
endif
|
endif
|
||||||
|
|
||||||
aufs:
|
|
||||||
ifndef CI
|
|
||||||
lsmod | grep aufs || modprobe aufs || apt-get install -qq -y linux-image-extra-`uname -r` > /dev/null
|
|
||||||
endif
|
|
||||||
|
|
||||||
stack:
|
stack:
|
||||||
ifeq ($(shell test -e /var/run/docker.sock && touch -c /var/run/docker.sock && echo $$?),0)
|
ifeq ($(shell test -e /var/run/docker.sock && touch -c /var/run/docker.sock && echo $$?),0)
|
||||||
ifdef BUILD_STACK
|
ifdef BUILD_STACK
|
||||||
|
|||||||
Reference in New Issue
Block a user