From d6df05f1d4f7dec4b29c059440a7854ffcca1fcc Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Thu, 8 Nov 2018 12:35:24 +0100 Subject: [PATCH 01/13] Ajout nom --- answers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/answers.md b/answers.md index defa8e2..70efe55 100644 --- a/answers.md +++ b/answers.md @@ -1,8 +1,8 @@ # Answers -Nom: -Prénom: -NB: +Nom: Valais +Prénom: Alexia +NB: 1 ## 1.3 command: From d4e3a1d246330d1ac433f606efc94a6603017262 Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Thu, 8 Nov 2018 13:30:29 +0100 Subject: [PATCH 02/13] Commande run --- answers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/answers.md b/answers.md index 70efe55..326ebff 100644 --- a/answers.md +++ b/answers.md @@ -5,7 +5,7 @@ Prénom: Alexia NB: 1 ## 1.3 -command: +command: docker run python_image ## 1.4 answer: From 826805df2f1cf43d9dcb773dcdfca174d2751861 Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Thu, 8 Nov 2018 14:04:17 +0100 Subject: [PATCH 03/13] Port 8080 --- answers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/answers.md b/answers.md index 326ebff..3da7b8e 100644 --- a/answers.md +++ b/answers.md @@ -8,8 +8,8 @@ NB: 1 command: docker run python_image ## 1.4 -answer: -command: +answer: On ne peut pas accéder à l'URL car le port 8080 est fermé. On doit préciser sur quel port on veut écouter et le nom de l'environnement. +command: docker run -p 8080:8080 -e ENVIRONMENT=back python_image ## 1.5 command: From 0b471eb456827bdd87bea7e376880f5066def0fc Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Thu, 8 Nov 2018 14:14:24 +0100 Subject: [PATCH 04/13] Environment --- answers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/answers.md b/answers.md index 3da7b8e..f4a81ac 100644 --- a/answers.md +++ b/answers.md @@ -8,11 +8,11 @@ NB: 1 command: docker run python_image ## 1.4 -answer: On ne peut pas accéder à l'URL car le port 8080 est fermé. On doit préciser sur quel port on veut écouter et le nom de l'environnement. -command: docker run -p 8080:8080 -e ENVIRONMENT=back python_image +answer: On ne peut pas accéder à l'URL car le port 8080 est fermé. On doit préciser sur quel port on veut écouter. +command: docker run -p 8080:8080 python_image ## 1.5 -command: +command: docker run -p 8080:8080 -e ENVIRONMENT=back python_image ## 1.6 answer: From 9a809fb02ffe99a84dc814b6a84faf255d65e1cb Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Thu, 8 Nov 2018 14:53:22 +0100 Subject: [PATCH 05/13] Push image --- answers.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/answers.md b/answers.md index f4a81ac..3ad7040 100644 --- a/answers.md +++ b/answers.md @@ -15,8 +15,10 @@ command: docker run -p 8080:8080 python_image command: docker run -p 8080:8080 -e ENVIRONMENT=back python_image ## 1.6 -answer: -command: +answer: L'image ne peut pas être envoyée telle qu'elle est car elle n'est pas trouvée localement. Il faut que son nom corresponde au nom du repo docker hub. +command: docker login + docker tag python_image avalais/tp2 + docker push avalais/tp2 ## 1.7 answer: From 55b01cd7d88bbf760751991247bb9e54b1fccb46 Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Fri, 9 Nov 2018 11:54:51 +0100 Subject: [PATCH 06/13] Pull from docker --- answers.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/answers.md b/answers.md index 3ad7040..fdd6e8a 100644 --- a/answers.md +++ b/answers.md @@ -15,16 +15,16 @@ command: docker run -p 8080:8080 python_image command: docker run -p 8080:8080 -e ENVIRONMENT=back python_image ## 1.6 -answer: L'image ne peut pas être envoyée telle qu'elle est car elle n'est pas trouvée localement. Il faut que son nom corresponde au nom du repo docker hub. +answer: L'image ne peut pas être envoyée telle qu'elle est car elle n'est pas trouvée localement. Il faut que son tag corresponde au nom du repo docker hub. command: docker login docker tag python_image avalais/tp2 docker push avalais/tp2 ## 1.7 -answer: -command: -command: -command: +answer: Lorsque l'on run l'image, elle est d'abord cherchée localement. Comme elle n'est pas trouvée, on la télécharge à partir du repo docker. +command: docker rmi $(docker images -a -q) => on récupère les ids de toutes les images +command: docker run -p 8080:8080 -e ENVIRONMENT=back avalais/tp2 +command: docker run -d -p 8080:8080 -e ENVIRONMENT=back avalais/tp2 ## 1.8 answer: From 4489de96ca7a9eacfbf97259163b8809a47058df Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Fri, 9 Nov 2018 17:11:20 +0100 Subject: [PATCH 07/13] Naming --- answers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/answers.md b/answers.md index fdd6e8a..59d5975 100644 --- a/answers.md +++ b/answers.md @@ -27,9 +27,9 @@ command: docker run -p 8080:8080 -e ENVIRONMENT=back avalais/tp2 command: docker run -d -p 8080:8080 -e ENVIRONMENT=back avalais/tp2 ## 1.8 -answer: -command: -command: +answer: On peut voir si le container est bien lancé et ses détails en faisant la commande docker ps. Le nom de mon container est vigilant_lalande. +command: docker ps +command: docker rename vigilant_lalande tp2_container ## 1.9 answer: From 33c7e1be3d3da4ec26f7488d4e6a61db7b2a8d5b Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Fri, 9 Nov 2018 17:22:11 +0100 Subject: [PATCH 08/13] OS --- answers.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/answers.md b/answers.md index 59d5975..0e0d7e0 100644 --- a/answers.md +++ b/answers.md @@ -32,8 +32,16 @@ command: docker ps command: docker rename vigilant_lalande tp2_container ## 1.9 -answer: -answer: +answer: L'OS utilisée par le container est Debian comme on peut le voir dans les caractéristiques. +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: From ad84e321996f8fe828d1efdd3ebe286353a34368 Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Fri, 9 Nov 2018 18:05:52 +0100 Subject: [PATCH 09/13] Front + path --- answers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/answers.md b/answers.md index 0e0d7e0..6ee4024 100644 --- a/answers.md +++ b/answers.md @@ -44,8 +44,8 @@ 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 avalais/tp2_front +answer: With path : alexia (from URL path) ## 2.1 command: From 699e7b316c536f04619f0b4e0f12545d462aed40 Mon Sep 17 00:00:00 2001 From: ece Date: Fri, 9 Nov 2018 18:15:24 +0100 Subject: [PATCH 10/13] Partie 1 --- app/back/Dockerfile | 11 +++++++++++ app/front/Dockerfile | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 app/back/Dockerfile create mode 100644 app/front/Dockerfile diff --git a/app/back/Dockerfile b/app/back/Dockerfile new file mode 100644 index 0000000..a9be37c --- /dev/null +++ b/app/back/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3.7.1-slim-stretch + +WORKDIR /usr/src/app + +COPY requirements.txt ./ + +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . + +CMD ["python", "-u", "./webservice.py"] diff --git a/app/front/Dockerfile b/app/front/Dockerfile new file mode 100644 index 0000000..455cb40 --- /dev/null +++ b/app/front/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3.7.1-slim-stretch + +WORKDIR /usr/src/app + +COPY requirements.txt ./ + +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . + +CMD ["python", "-u", "./front.py"] From 1869babad51cfb242aef8ace9ac009e7c3656c08 Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Mon, 19 Nov 2018 18:12:45 +0100 Subject: [PATCH 11/13] =?UTF-8?q?Cr=C3=A9ation=20docker-compose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- answers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/answers.md b/answers.md index 6ee4024..e910aed 100644 --- a/answers.md +++ b/answers.md @@ -48,7 +48,7 @@ command: docker run -p 8081:8081 -e APP_PORT=8081 -e WS_BACK_URL=172.17.0.1 -d answer: With path : alexia (from URL path) ## 2.1 -command: +command: docker-compose up ## 2.6 command: From bab4c87db57ba3c98bd926f1d087126700aae4ae Mon Sep 17 00:00:00 2001 From: alexiavls <44462079+alexiavls@users.noreply.github.com> Date: Tue, 20 Nov 2018 15:52:40 +0100 Subject: [PATCH 12/13] Fin part2 --- answers.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/answers.md b/answers.md index e910aed..4283764 100644 --- a/answers.md +++ b/answers.md @@ -51,7 +51,8 @@ answer: With path : alexia (from URL path) command: docker-compose up ## 2.6 -command: -command: - +command: docker-compose up -d +command: docker-compose logs +## 2.9 +command: docker-compose up --scale service_back=2 From 77cf6fede144c0b2a2299d1da2bcfabf2a8498f3 Mon Sep 17 00:00:00 2001 From: ece Date: Tue, 20 Nov 2018 15:53:21 +0100 Subject: [PATCH 13/13] Part 2 --- docker-compose.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..51ea6d8 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,24 @@ +version: '3' +services: + service_back: + environment: + - ENVIRONMENT=back + image: avalais/tp2 +# volumes: +# - data-volume:/var/lib/back + + service_front: + ports: + - "8081:8081" + environment: + - APP_PORT=8081 + - WS_BACK_URL=back + image: avalais/tp2_front + links: + - "service_back:back" +# volumes: +# - data-volume:/var/lib/front + +#volumes: +# data-volume: +