From 58d03653e12b5e776c26030ee7c01908012e4662 Mon Sep 17 00:00:00 2001
From: LIsa <vuong.lisa@yahoo.fr>
Date: Thu, 8 Nov 2018 12:42:16 +0100
Subject: [PATCH 1/3] name

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

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

From 403a99ff6accfa66af2a436d156f3f31a7a9f534 Mon Sep 17 00:00:00 2001
From: LIsa <vuong.lisa@yahoo.fr>
Date: Tue, 13 Nov 2018 21:28:24 +0100
Subject: [PATCH 2/3] tp2 v1

---
 answers.md           | 42 +++++++++++++++++++++++++++---------------
 app/back/Dockerfile  |  9 +++++++++
 app/back/docker      |  0
 app/front/Dockerfile | 10 ++++++++++
 app/front/docker     |  0
 5 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 app/back/Dockerfile
 create mode 100644 app/back/docker
 create mode 100644 app/front/Dockerfile
 create mode 100644 app/front/docker

diff --git a/answers.md b/answers.md
index f8362f0..c4f7e0d 100644
--- a/answers.md
+++ b/answers.md
@@ -6,35 +6,47 @@ NB: 3
 
 ## 1.3
 command: 
+docker build -t img .
+docker run img
 
 ## 1.4
-answer:
-command: 
+answer: car les ports ne sont pas ouverts
+command: docker run -p 8080:8080 img
 
 ## 1.5
-command: 
+command: docker run -e ENVIRONMENT=dev -p 8080:8080 img
 
 ## 1.6
-answer:
-command: 
-
+answer: car le nom de l'image n'est pas bon
+command: docker tag img lisav/img:0.1 --> docker push lisav/img:0.1
+         
 ## 1.7
-answer:
-command: 
-command: 
-command: 
+command: sudo docker rmi -f $(docker images -q)
+answer: l'image est "pull" du repository docker lisav/img comme il ne le trouve pas localement
+command: docker run -e ENVIRONMENT=dev -p 8080:8080 lisav/img
+command: docker run -d -e ENVIRONMENT=dev -p 8080:8080 lisav/img
 
 ## 1.8
-answer:
-command: 
-command: 
+answer: name = ecstatic_mcnulty and container id = d4fb6f40aa9a. 
+command: docker ps  OU docker container ls
+command: docker rename ecstatic_mcnulty realcontainersname
 
 ## 1.9
+answer: L'OS utilisé est Debian GNU/Linux 9.
 answer:
-answer:
+PRETTY_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: 
+command: docker run -p 8081:8081 -e WS_BACK_URL=172.17.0.1 -e APP_PORT=8081 front
+answer:pour le back, ce qui change est :   "result": "path_test"
+       pour le front, ce qui change est :   With path : path_test   (from URL path)
 
 ## 2.1
 command: 
diff --git a/app/back/Dockerfile b/app/back/Dockerfile
new file mode 100644
index 0000000..b91bd52
--- /dev/null
+++ b/app/back/Dockerfile
@@ -0,0 +1,9 @@
+FROM python:3.7.1-stretch
+
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+CMD [ "python", "-u", "./webservice.py" ]
+
diff --git a/app/back/docker b/app/back/docker
new file mode 100644
index 0000000..e69de29
diff --git a/app/front/Dockerfile b/app/front/Dockerfile
new file mode 100644
index 0000000..e8d3eee
--- /dev/null
+++ b/app/front/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3.7.1-stretch
+
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+CMD [ "python", "-u", "./front.py" ]
+
+VOLUME app/logs
diff --git a/app/front/docker b/app/front/docker
new file mode 100644
index 0000000..e69de29

From 92a03ea78a4583eda52a231c7d18d885709d0414 Mon Sep 17 00:00:00 2001
From: LIsa <vuong.lisa@yahoo.fr>
Date: Wed, 14 Nov 2018 20:37:38 +0100
Subject: [PATCH 3/3] tp2 v2

---
 answers.md             |  6 +++---
 app/docker-compose.yml | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 app/docker-compose.yml

diff --git a/answers.md b/answers.md
index c4f7e0d..6456c3f 100644
--- a/answers.md
+++ b/answers.md
@@ -49,10 +49,10 @@ answer:pour le back, ce qui change est :   "result": "path_test"
        pour le front, ce qui change est :   With path : path_test   (from URL path)
 
 ## 2.1
-command: 
+command: docker-compose up
 
 ## 2.6
-command: 
-command: 
+command: docker-compose up -d
+command: docker-compose logs -f
 
 
diff --git a/app/docker-compose.yml b/app/docker-compose.yml
new file mode 100644
index 0000000..2484881
--- /dev/null
+++ b/app/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3'
+services:
+  back:
+    image: a99d471b3ab1
+    ports:
+      - "8080:8080"
+    environment:
+      - ENVIRONMENT=dev 
+  front:
+    image: a38dcb68fd6e 
+    ports: 
+      - "8081:8081"
+    environment:
+      - APP_PORT=8081
+      - WS_BACK_URL=172.17.0.1