From f290dbb63de8b96615dda4e56e3fc564cbaadc8d Mon Sep 17 00:00:00 2001
From: Adri <adrien.marchand@edu.ece.fr>
Date: Thu, 8 Nov 2018 12:37:56 +0100
Subject: [PATCH 1/2] nom etc

---
 answers.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/answers.md b/answers.md
index 25c43e4..e8deaf0 100644
--- a/answers.md
+++ b/answers.md
@@ -1,8 +1,8 @@
 # Answers
 
-Nom: 
-Prénom: 
-NB: 
+Nom: Marchand
+Prénom: Adrien
+NB: 3
 
 ## 1.3
 command: 

From dc9768b9613b8c6ee3b7481f808f2ce3af64f52b Mon Sep 17 00:00:00 2001
From: Adri <adrien.marchand@edu.ece.fr>
Date: Mon, 19 Nov 2018 18:55:48 +0100
Subject: [PATCH 2/2] fin tp2

---
 answers.md             | 45 ++++++++++++++++++++++++------------------
 app/back/Dockerfile    | 10 ++++++++++
 app/docker-compose.yml | 18 +++++++++++++++++
 3 files changed, 54 insertions(+), 19 deletions(-)
 create mode 100644 app/back/Dockerfile
 create mode 100644 app/docker-compose.yml

diff --git a/answers.md b/answers.md
index e8deaf0..7f88713 100644
--- a/answers.md
+++ b/answers.md
@@ -5,42 +5,49 @@ Prénom: Adrien
 NB: 3
 
 ## 1.3
-command: 
+command: docker build -t tp2 ./
 
 ## 1.4
-answer:
-command: 
+answer: Elle ne répond rien parce qu'elle n'autorise pas la connexion : les ports sont fermés.
+command: docker run -p 8080:8080 tp2
 
 ## 1.5
-command: 
+command: docker run -p 8080:8080 -e ENVIRONMENT=python:3-alpine tp2
 
 ## 1.6
-answer:
-command: 
+answer: Parce qu'elle n'a pas le bon nom.
+command: docker tag tp2 admar/tp2:0.1 --> docker push admar/tp2:0.1
 
 ## 1.7
-answer:
-command: 
-command: 
-command: 
+answer: l'image est introuvable localement, docker va la télécharger avant de la lancer.
+command: sudo docker rmi -f $(docker images -q)
+command: docker run -p 8080:8080 -e ENVIRONMENT=python:3-alpine tp2
+command: docker run -p 8080:8080 -e ENVIRONMENT=python:3-alpine -d tp2
 
 ## 1.8
-answer:
-command: 
-command: 
+answer: nom de mon containe : tp2, id : b752ca30cdc8
+command: docker ps
+command: docker rename b752ca30cdc8 contp2
 
 ## 1.9
-answer:
-answer:
+answer:NAME="Alpine Linux"
+ID=alpine
+VERSION_ID=3.8.1
+PRETTY_NAME="Alpine Linux v3.8"
+HOME_URL="http://alpinelinux.org"
+BUG_REPORT_URL="http://bugs.alpinelinux.org"
 
 ## 1.11
-command: 
+command: docker run -p 8080:8080 -e APP_PORT=8080 -e WS_BACK_URL=172.17.0.1 admar/tp2_container:tp2 
+answer: You called at : 2018-11-11 22:34:12.552369 (dynamic) On environment : dev (from env variable) With path : test (from URL path) With front : 1a26378314c6 (from real hostname of front service) With back : 018cde996282 (from real hostname of back service)
 
 ## 2.1
-command: 
+command: docker-compose up
 
 ## 2.6
-command: 
-command: 
+command: docker-compose up -d command: docker-compose logs
+
+## 2.6
+command: docker-compose up --scale back_service=2
 
 
diff --git a/app/back/Dockerfile b/app/back/Dockerfile
new file mode 100644
index 0000000..ecc01f9
--- /dev/null
+++ b/app/back/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3.7.1-stretch
+
+COPY requirements.txt ./
+RUN pip install -r requirements.txt
+
+COPY . .
+
+CMD [ "python", "-u", "./webservice.py"]
+
+ENV ENVIRONMENT = python:3-alpine
diff --git a/app/docker-compose.yml b/app/docker-compose.yml
new file mode 100644
index 0000000..19c0dd6
--- /dev/null
+++ b/app/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3'
+services:
+  back_service:
+    image: admar/tp2_container:back_end
+    environment:
+      - ENVIRONMENT=dev
+#    volumes:
+#      - data-volume:/var/lib/back_end
+
+  front_service:
+    image: admar/front_container:front
+    ports:
+      - "8080:8080"
+    environment:
+      - APP_PORT=8080
+      - WS_BACK_URL=back_end
+    links:
+      - "back_service:back_end"