From dbc319384622a6b4b7c0c477de4d989818edbabc Mon Sep 17 00:00:00 2001
From: Victor <victor.monomakhoff@edu.ece.fr>
Date: Thu, 8 Nov 2018 12:36:40 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Fichier=20modifi=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/answers.md b/answers.md
index defa8e2..7673be5 100644
--- a/answers.md
+++ b/answers.md
@@ -1,8 +1,8 @@
 # Answers
 
-Nom: 
-Prénom: 
-NB: 
+Nom: Monomakhoff
+Prénom: Victor
+NB: 1
 
 ## 1.3
 command: 

From bbceffb5c0e85e2c0638973290be37e7618236a6 Mon Sep 17 00:00:00 2001
From: Victor <victor.monomakhoff@edu.ece.fr>
Date: Wed, 21 Nov 2018 19:31:52 +0100
Subject: [PATCH 2/2] Exercice 2 complete

---
 answers.md             | 50 +++++++++++++++++++++++++-----------------
 app/back/Dockerfile    | 10 +++++++++
 app/docker-compose.yml | 34 ++++++++++++++++++++++++++++
 app/front/Dockerfile   | 10 +++++++++
 4 files changed, 84 insertions(+), 20 deletions(-)
 create mode 100644 app/back/Dockerfile
 create mode 100644 app/docker-compose.yml
 create mode 100644 app/front/Dockerfile

diff --git a/answers.md b/answers.md
index 7673be5..3ee3ee3 100644
--- a/answers.md
+++ b/answers.md
@@ -5,43 +5,53 @@ Prénom: Victor
 NB: 1
 
 ## 1.3
-command: 
+command: docker run tp2_back
 
 ## 1.4
-answer:
-command: 
+answer: Le port 8080 est fermé :/
+command: docker run -p 8080:8080 -e ENVIRONMENT=back tp2_back
 
 ## 1.5
-command: 
+command: ENVIRONMENT=back
 
 ## 1.6
-answer:
-command: 
+answer: An image does not exist locally with the tag: vmonomakhoff/tp2
+command: docker images
+	 docker tag b84636daa55d vmonomakhoff/tp2
 
 ## 1.7
-answer:
-command: 
-command: 
-command: 
+answer: L'image est pull avant que l'image redémarre
+command: docker rmi -f $(docker images -q)
+command: docker run -p 8080:8080 -e ENVIRONMENT=back vmonomakhoff/tp2
+command: docker run -p 8080:8080 -e ENVIRONMENT=back -d vmonomakhoff/tp2
 
 ## 1.8
-answer:
-command: 
-command: 
+answer: zealous_bhabha
+command: docker ps
+command: docker rename zealous_bhabha TP2Back
+	 docker restart TP2Back
 
 ## 1.9
-answer:
-answer:
+answer: docker exec -it TP2Back cat /etc/*release
+answer: docPRETTY_NAME="Debian GNU/Linux 9 (stretch)"
+	NAME="Debian GNU/Linux"
+	VERSION_ID="9"
+	VERSION="9 (stretch)"
+	ID=debian
+	HOME_URL="https://www.debian.org/"
+	SUPPORT_URL="https://www.debian.org/support"
+	BUG_REPORT_URL="https://bugs.debian.org/"
+
 
 ## 1.11
-command: 
-answer:
+command: docker run -p 8081:8081 -e APP_PORT=8081 -e WS_BACK_URL=172.17.0.1 -d vmonomakhoff/tp2_f
+answer: With path : toto   (from URL path)
 
 ## 2.1
-command: 
+command: docker-compose run tp2
 
 ## 2.6
-command: 
-command: 
+command: docker-compose run -d back 
+command: docker-compose run -d front
 
 
diff --git a/app/back/Dockerfile b/app/back/Dockerfile
new file mode 100644
index 0000000..2898f1a
--- /dev/null
+++ b/app/back/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3.7.1-stretch
+
+WORKDIR /tp2/app/back
+
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+CMD [ "python", "-u", "./webservice.py" ]
diff --git a/app/docker-compose.yml b/app/docker-compose.yml
new file mode 100644
index 0000000..3c499ff
--- /dev/null
+++ b/app/docker-compose.yml
@@ -0,0 +1,34 @@
+version: "3"
+
+services:
+  back:
+    image: vmonomakhoff/tp2
+    deploy:
+      replicas: 5
+      resources:
+        limits:
+          cpus: "0.1"
+          memory: 50M
+      restart_policy:
+        condition: on-failure
+    expose:
+      - "8080:8080"  
+    environment : 
+     - ENVIRONMENT=back
+     
+  front:
+     image: vmonomakhoff/tp2_f
+     deploy:
+       replicas: 5
+       resources:
+         limits:
+           cpus: "0.1"
+           memory: 50M
+       restart_policy:
+         condition: on-failure
+     ports:
+       - "8081:8081"
+     environment : 
+       - APP_PORT=8081 
+       - WS_BACK_URL=172.17.0.1
+
diff --git a/app/front/Dockerfile b/app/front/Dockerfile
new file mode 100644
index 0000000..9df0477
--- /dev/null
+++ b/app/front/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3.7.1-stretch
+
+WORKDIR /tp2/app/front
+
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+CMD [ "python", "-u", "./front.py" ]