MYIDmu

Dockerfile.yakkety

@@ -32,10 +32,11 @@ USER test
 WORKDIR /home/test
 ENV mybootstrap 12345
 #RUN curl https://raw.githubusercontent.com/Thalhalla/thalhalla-playbook/master/bootstrapThalhalla.sh | bash
-RUN bash bootstrapThalhalla.sh ; \
-sudo apt-get -y autoremove; \
-sudo apt-get clean; \
-sudo rm -rf /var/lib/apt/lists/*
+#RUN bash bootstrapThalhalla.sh ; \
+#sudo apt-get -y autoremove; \
+#sudo apt-get clean; \
+#sudo rm -rf /var/lib/apt/lists/*
+RUN echo fuckit
 
 ENV DEBIAN_FRONTEND interactive
 CMD ["/bin/bash"]

Makefile

@@ -1,4 +1,3 @@
-SHELL:=/bin/bash --login
 
 all: help
 
@@ -63,44 +62,53 @@ nvm:
 rundocker:
 	$(eval TMP := $(shell mktemp -d --suffix=ThalhallaDOCKERTMP))
 	chmod 777 $(TMP)
-	@docker run --name=thalhalla-test \
+	docker run --name=thalhalla-test \
 	--cidfile="cid" \
 	-v $(TMP):/tmp \
 	-d \
 	--privileged \
 	-t thalhalla-test
 
+update: SHELL:=/bin/bash --login
 update:
 	ansible-playbook -i hosts  update.yml
 
 updatearch:
 	sudo pacman -Syu --noconfirm
 
+nodejs: SHELL:=/bin/bash --login
 nodejs:
 	ansible-playbook -i hosts  nodejs.yml
 
+ruby: SHELL:=/bin/bash --login
 ruby:
 	ansible-playbook -i hosts  ruby.yml
 
 rubyarch:
 	bash installrvm.sh
 	bash gemInstaller.sh
 
+zsh: SHELL:=/bin/bash --login
 zsh:
 	ansible-playbook -i hosts  zsh.yml
 
+videodeb: SHELL:=/bin/bash --login
 videodeb:
 	ansible-playbook -i hosts  videodeb.yml
 
+audiodeb: SHELL:=/bin/bash --login
 audiodeb:
 	ansible-playbook -i hosts  audiodeb.yml
 
+videoarch: SHELL:=/bin/bash --login
 videoarch:
 	ansible-playbook -i hosts  videoarch.yml
 
+audioarch: SHELL:=/bin/bash --login
 audioarch:
 	ansible-playbook -i hosts  audioarch.yml
 
+spf13: SHELL:=/bin/bash --login
 spf13:
 	ansible-playbook -i hosts  spf13.yml
 
@@ -111,18 +119,23 @@ janus:
 	echo 'Janus Documentation |==> https://github.com/carlhuda/janus <==|'
 	sleep 1
 
+thalhallaarch: SHELL:=/bin/bash --login
 thalhallaarch:
 	ansible-playbook -i hosts  thalhallaarch.yml
 
+thalhalladeb: SHELL:=/bin/bash --login
 thalhalladeb:
 	ansible-playbook -i hosts  thalhalladeb.yml
 
+thalhallayakkety: SHELL:=/bin/bash --login
 thalhallayakkety:
 	ansible-playbook -i hosts  thalhallayakkety.yml
 
+thoth: SHELL:=/bin/bash --login
 thoth:
 	ansible-playbook -i hosts  thoth.yml
 
+azagthoth: SHELL:=/bin/bash --login
 azagthoth:
 	ansible-playbook -i hosts  azagthoth.yml
 
@@ -132,13 +145,15 @@ build:
 	sudo apt-get install -y ansible git build-essential aptitude
 	date -I>build
 
+bootstrap: SHELL:=/bin/bash --login
 bootstrap:
 	ansible-playbook -i hosts  bootstrapAnsible.yml
 
 localbootstraparch:
 	sudo pacman -S --noconfirm ansible
 	date -I>localbootstraparch
 
+localbootstrap: SHELL:=/bin/bash --login
 localbootstrap:
 	sudo bash bootstrapansible.sh
 	bash installansible.sh

bootstrapThalhalla.sh

@@ -8,6 +8,7 @@ python-pip python-dev libffi-dev libssl-dev libxml2-dev libxslt1-dev libjpeg8-de
 git clone https://github.com/thalhalla/thalhalla-playbook.git
 cd thalhalla-playbook
 echo `whoami`>USERNAME
+echo `whoami`>MYID
 cp hosts.example hosts
 echo `lsb_release -cs`
 make `lsb_release -cs`