Merge pull request #37 from dduportal/demo2

Merging demo2 to development

Author: jmMeessen

Diff for: Makefile

@@ -1,40 +1,29 @@
-.PHONY: build shell test all presentation start clean backup
+.PHONY: build shell test all presentation start clean backup prepare
 
-DOCKER_IMAGE := cpt_igloo/devbox
-DOCKER_NAME = devbox
+WEB_SRV_NAME = app_devbox_1
 
 all: build test
 
-build:
-	docker build --tag "$(DOCKER_IMAGE)" .
+build: prepare
+	docker-compose -p app build
 	mkdir -p ~/.x2goclient
 	cp -f configs/sessions ~/.x2goclient/
 
 start:
 	mkdir -p ~/work/mavenRepo/docker
-	docker start $(DOCKER_NAME) 2>/dev/null || docker run \
-		--name $(DOCKER_NAME) \
-		-d \
-		-p 2200:22 \
-		-v $$(which docker):$$(which docker) \
-		-v /var/run/docker.sock:/var/run/docker.sock \
-		-v ~/work/mavenRepo/docker:/data/mavenRepo \
-		-v /home/docker/.docker:/home/dockerx/.docker \
-		-e DOCKER_HOST=tcp://10.0.2.15:2376 \
-		-e DOCKER_TLS_VERIFY=1 \
-		$(DOCKER_IMAGE)
+	docker-compose -p app up -d
 
-shell: start
-	docker exec --tty --interactive $(DOCKER_NAME) bash -l
+shell:
+	docker exec -ti app_devbox_1 bash -l
 
 gui: start
 	/Applications/x2goclient.app/Contents/MacOS/x2goclient \
 		--session=devbox
 
 presentation:
-	docker kill $(DOCKER_NAME)-web || :
-	docker rm $(DOCKER_NAME)-web || :
-	@docker run -d --name $(DOCKER_NAME)-web -v $(CURDIR)/slides:/www -p 80:80 fnichol/uhttpd
+	docker kill $(WEB_SRV_NAME) || :
+	docker rm $(WEB_SRV_NAME) || :
+	@docker run -d --name $(WEB_SRV_NAME) -v $(CURDIR)/slides:/www -p 80:80 fnichol/uhttpd
 	@echo http://$$(boot2docker ip 2>/dev/null):80
 
 test:
@@ -47,12 +36,14 @@ test:
 			/app/tests/bats/
 
 backup:
-	docker exec --detach $(DOCKER_NAME) tar czf /tmp/bkp-data-latest.tgz /data/
-	docker cp $(DOCKER_NAME):/tmp/bkp-data-latest.tgz ./
+	docker-compose -p app run devbox tar czf /tmp/bkp-data-latest.tgz /data/
 
 clean:
-	docker kill $(DOCKER_NAME)
-	docker rm $(DOCKER_NAME)
+	docker-compose -p app kill
+	docker-compose -p app rm -f -v
+
+prepare:
+	if [ "$$CIRCLECI" = "true" ]; then curl -L https://github.com/docker/compose/releases/download/1.2.0/docker-compose-`uname -s`-`uname -m` > /home/ubuntu/bin/docker-compose && chmod +x /home/ubuntu/bin/docker-compose;fi
 
 
 

Diff for: README.md

@@ -101,4 +101,3 @@ $ make presentation
 To display it, start your favourite browser and point it to the address echoed on the screen, once the container is started.
 
 
-

Diff for: docker-compose.yml

@@ -0,0 +1,33 @@
+data:
+  image: debian:wheezy
+  command: chmod -R 777 /proxy-cache
+  volumes:
+    - /data
+    - /var/log
+    - /proxy-cache
+    - ~/work/mavenRepo/docker:/data/mavenRepo 
+  net: "none"
+proxy:
+  image: clue/polipo
+  command: proxyAddress=0.0.0.0 proxyPort=8123 diskCacheRoot=/proxy-cache logFile=/var/log/polipo.log
+  expose:
+    - "8123"
+  volumes_from:
+    - data
+devbox:
+  build: ./
+  ports:
+    - "2200:22"
+  volumes_from:
+    - data
+  links:
+    - proxy
+  volumes:
+    - /usr/local/bin/docker:/usr/local/bin/docker
+    - /home/docker/.docker:/home/dockerx/.docker
+  environment:
+  - DOCKER_HOST=tcp://10.0.2.15:2376
+  - DOCKER_TLS_VERIFY=1
+  - http_proxy=http://proxy:8123
+  - https_proxy=http://proxy:8123
+  - no_proxy=localhost,127.0.0.1,10.0.2.15

Diff for: slides/pictures/GNU_make.jpg

@@ -362,7 +362,8 @@ layout: false
 
 ]
 ???
-(jmm)
+ddu
+
 ---
 
 template: inverse
@@ -468,17 +469,20 @@ layout: false
 # Démo Time !
 ]
 .right-column[
-  # Démo Time !
-
-  * Contexte : spring boot "hello world" application
-  * Java DK, Maven, IntelliJ Idea, Docker, Compose
-  * https://github.com/jmMeessen/devbox
-  * Use cases :
-    * Onboarding
-    * Developement simple basé sur Spring Boot
-    * MaJ IDEA sans casser le dev workflow
-    * Portabilité
-    * ? Legacy (reprendre de vieilles applications)
+# Démo Time !
+
+* Objet : Spring boot "hello world" application
+
+* Java DK, Maven, IntelliJ Idea, Docker, Compose
+
+* Open and reusable code : [https://github.com/jmMeessen/devbox](https://github.com/jmMeessen/devbox)
+
+* Use cases :
+  * Onboarding
+  * Developement simple basé sur Spring Boot
+  * MaJ IDEA sans casser le dev workflow
+  * Portabilité
+  * Legacy (Lon living applications)
 ]
 ???
 jmm
@@ -493,10 +497,13 @@ layout: false
   # SCM :Git (on Github)
 
   * Public
+
   * Partagé
+
   * Pull-Request systématique (Github workflow)
 
-.center[![GitWorkflow](pictures/gitflow.jpg)]
+.center[![Github](pictures/github-logo.jpg)]
+.center[![GitWorkflow](pictures/git-pr.png)]
 
 
 ]
@@ -577,12 +584,14 @@ layout: false
   ## Devbox as a code
 ]
 .right-column[
-  # Docker stack
+# Docker stack
+
+Utilisation de [boot2docker](https://boot2docker.io) :
+* Multi-plateforme (virtualbox)
+* Support officiel de Docker
+
+.center[![Boot2docker](pictures/b2d.jpg)]
 
-  Utilisation de [boot2docker](https://boot2docker.io) :
-  * Multi-plateforme (virtualbox)
-  * Support officiel de Docker
- 
 ]
 ???
 jmm
@@ -628,9 +637,9 @@ layout: false
   ## Devbox as a code
 ]
 .right-column[
-  # Demo 1 : 
+# Demo 1 : 
 
-  FIXME : schema global
+.center[![Demo1](pictures/demo1.png)]
  
 ]
 ???
@@ -698,9 +707,9 @@ layout: false
   ## Devbox as an infrastructure
 ]
 .right-column[
-  # Demo 2 : 
+# Demo 2 : 
 
-  FIXME : schema global
+.center[![Demo2](pictures/demo2.png)]
  
 ]
 

Diff for: slides/pictures/b2d.jpg

@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 
 CONTAINER_TEST_NAME=testing_devbox
-DEVBOX_IMAGE_NAME=cpt_igloo/devbox
+DEVBOX_IMAGE_NAME=app_devbox
 
 
 run_cmd_in_devbox() {