From 1a348ccd0b27dfe311753c2281bf45454bd19842 Mon Sep 17 00:00:00 2001 From: Jean de Solms Date: Thu, 8 Nov 2018 12:35:41 +0100 Subject: [PATCH 1/5] added name --- answers.md | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/answers.md b/answers.md index defa8e2..307520e 100644 --- a/answers.md +++ b/answers.md @@ -1,47 +1,45 @@ # Answers -Nom: -Prénom: -NB: +Nom: de Solms +Prénom: Jean +NB: 1 ## 1.3 -command: +command: ## 1.4 answer: -command: +command: ## 1.5 -command: +command: ## 1.6 answer: -command: +command: ## 1.7 answer: -command: -command: -command: +command: +command: +command: ## 1.8 answer: -command: -command: +command: +command: ## 1.9 answer: answer: ## 1.11 -command: +command: answer: ## 2.1 -command: +command: ## 2.6 -command: -command: - - +command: +command: From eada5f3f5be5dac7b832c4477b21abce21bc8343 Mon Sep 17 00:00:00 2001 From: Jean de Solms Date: Thu, 8 Nov 2018 22:40:55 +0100 Subject: [PATCH 2/5] commiting current advencement (2.4) --- answers.md | 37 ++++++++++++++++++++++++------------- app/back/Dockerfile | 11 +++++++++++ app/docker-compose.yml | 16 ++++++++++++++++ app/front/Dockerfile | 11 +++++++++++ 4 files changed, 62 insertions(+), 13 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 307520e..b32eb45 100644 --- a/answers.md +++ b/answers.md @@ -5,33 +5,44 @@ Prénom: Jean NB: 1 ## 1.3 -command: +command: docker run tp2_container ## 1.4 -answer: -command: +answer: Cette adresse ne répond pas car nous n'avons pas exposé le port 8080 et ne pouvons donc pas accéder à l'adresse via ce port. +command: docker run -p 8080:8080 -e ENVIRONMENT=dev tp2_container ## 1.5 -command: +command: docker run -p 8080:8080 -e ENVIRONMENT=dev tp2_container ## 1.6 -answer: -command: +answer: Il faut lier l'image à notre compte pour éviter de potentiels doublons +command: docker tag c47ee72e5257 jeandslms/tp2_container:back_end ## 1.7 answer: -command: -command: -command: +command: docker rmi $(docker images -a -q) +command: docker run -p 8080:8080 -e ENVIRONMENT=dev jeandslms/tp2_container:back_end +command: docker run -d -p 8080:8080 -e ENVIRONMENT=dev jeandslms/tp2_container:back_end ## 1.8 -answer: -command: -command: +answer: En faisant "docker ps" nous pouvons observer que le container est bien démarré. Le nom de mon container est "infallible_panini" ceci n'est pas très explicite... +command: docker ps +command: docker rename infallible_panini back_end ## 1.9 +answer:L'os utilisé est un linux debian answer: -answer: +``` +root@a532421514a6:/app/back# cat /etc/*release +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: diff --git a/app/back/Dockerfile b/app/back/Dockerfile new file mode 100644 index 0000000..fd32019 --- /dev/null +++ b/app/back/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3.7.1-stretch + +WORKDIR /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..01c2204 --- /dev/null +++ b/app/docker-compose.yml @@ -0,0 +1,16 @@ +version: '3' +services: + back_service: + image: jeandslms/tp2_container:back_end + ports: + - "8080:8080" + environment: + - ENVIRONMENT=dev + + front_service: + image: jeandslms/front_container:front + 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..5ee1541 --- /dev/null +++ b/app/front/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3.7.1-stretch + +WORKDIR /app/front/ + +COPY requirements.txt ./ + +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . + +CMD [ "python", "-u", "./front.py"] From 02114b6fd59553a93de242cf48ceda36d627f46e Mon Sep 17 00:00:00 2001 From: Jean de Solms Date: Thu, 8 Nov 2018 22:42:23 +0100 Subject: [PATCH 3/5] commited missing answers --- answers.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/answers.md b/answers.md index e8c4b41..ebdb623 100644 --- a/answers.md +++ b/answers.md @@ -45,12 +45,19 @@ 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 jeandslms/front_container:front +answer: Pour trouver l'adresse de WS_BACK_URL il faut faire un ifconfig, on trouve alors l'adresse ip du container. +Contenu : +" +You called at : 2018-11-08 21:24:14.369606 (dynamic) +On environment : dev (from env variable) +With path : coucou (from URL path) +With front : 330e3fde2377 (from real hostname of front service) +With back : d6abf7effd9b (from real hostname of back service) +" ## 2.1 -command: +command: docker-compose up ## 2.6 command: From c5bc7c23ebf11f92afd0a0bfdd6914dbf3e73d1e Mon Sep 17 00:00:00 2001 From: Jean de Solms Date: Fri, 9 Nov 2018 11:53:02 +0100 Subject: [PATCH 4/5] Added missing answer --- answers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/answers.md b/answers.md index ebdb623..fd0ae3b 100644 --- a/answers.md +++ b/answers.md @@ -19,7 +19,7 @@ answer: Il faut lier l'image à notre compte pour éviter de potentiels doublons command: docker tag c47ee72e5257 jeandslms/tp2_container:back_end ## 1.7 -answer: +answer: L'image n'étant pas présente en local, docker va la récupérer sur docker hub afin de pouvoir runner l'image command: docker rmi $(docker images -a -q) command: docker run -p 8080:8080 -e ENVIRONMENT=dev jeandslms/tp2_container:back_end command: docker run -d -p 8080:8080 -e ENVIRONMENT=dev jeandslms/tp2_container:back_end @@ -60,5 +60,5 @@ With back : d6abf7effd9b (from real hostname of back service) command: docker-compose up ## 2.6 -command: -command: +command: docker-compose up -d +command: docker-compose logs (-f for follow) From 03fba4ab86bfdb209ea89ef8d40a2b3a3e406794 Mon Sep 17 00:00:00 2001 From: Jean de Solms Date: Sun, 18 Nov 2018 20:27:08 +0100 Subject: [PATCH 5/5] finished 1 and 2 --- answers.md | 2 +- app/docker-compose.yml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/answers.md b/answers.md index 894277c..111953b 100644 --- a/answers.md +++ b/answers.md @@ -64,4 +64,4 @@ command: docker-compose up -d command: docker-compose logs (-f for follow) ##2.9 -command: +command: docker-compose up --scale back_service=2 diff --git a/app/docker-compose.yml b/app/docker-compose.yml index ab12928..c252f99 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -2,10 +2,10 @@ version: '3' services: back_service: image: jeandslms/tp2_container:back_end - ports: - - "8080:8080" environment: - ENVIRONMENT=dev +# volumes: +# - data-volume:/var/lib/back_end front_service: image: jeandslms/front_container:front @@ -13,6 +13,11 @@ services: - "8081:8081" environment: - APP_PORT=8081 - - WS_BACK_URL=172.17.0.1 + - WS_BACK_URL=back_end links: - "back_service:back_end" +# volumes: +# - data-volume:/var/lib/front + +#volumes: +# data-volume: