From 44e83f2b58e8a408becae99ceebe860d3b3c0050 Mon Sep 17 00:00:00 2001 From: Tombenpotter Date: Thu, 8 Nov 2018 12:35:25 +0100 Subject: [PATCH 1/4] Added name and group number --- answers.md | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/answers.md b/answers.md index defa8e2..f23a97f 100644 --- a/answers.md +++ b/answers.md @@ -1,47 +1,45 @@ # Answers -Nom: -Prénom: -NB: +Nom: Benguigui +Prénom: Thomas +NB: Groupe 3 ## 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 005ca1f00b5bb9e9d9222e118ad886d6315e2455 Mon Sep 17 00:00:00 2001 From: Tombenpotter Date: Sun, 11 Nov 2018 23:20:02 +0100 Subject: [PATCH 2/4] End of part 1 of the lab Signed-off-by: Tombenpotter --- answers.md | 50 +++++++++++++++++++++++++++++--------------- app/back/Dockerfile | 10 +++++++++ app/front/Dockerfile | 10 +++++++++ 3 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 app/back/Dockerfile create mode 100644 app/front/Dockerfile diff --git a/answers.md b/answers.md index f23a97f..ef31462 100644 --- a/answers.md +++ b/answers.md @@ -5,37 +5,53 @@ Prénom: Thomas NB: Groupe 3 ## 1.3 -command: +command: docker run tp2 +On a créé l'image docker avec "docker build -t tp2 ./" ## 1.4 -answer: -command: +answer: La machine n'autorise pas la connexion car les ports sont fermés. +command: docker run -p 8080:8080 tp2 ## 1.5 -command: +command: docker run -p 8080:8080 -e ENVIRONMENT=dev tp2 ## 1.6 -answer: -command: +answer: L'image n'a pas un nom qui correspond à celui du repo docker. +command: docker tag tp2 tombenpotter/microservices-tp2:0.1 +docker push tombenpotter/microservices-tp2:0.1 ## 1.7 -answer: -command: -command: -command: +answer: L'image n'est pas trouvée localement, donc docker va la télécharger sur le hub avant de la lancer. +command: docker rmi $(docker images -q) +command: docker run -p 8080:8080 -e ENVIRONMENT=dev tombenpotter/tp2:0.1 +command: docker run -d -p 8080:8080 -e ENVIRONMENT=dev tombenpotter/tp2:0.1 ## 1.8 -answer: -command: -command: +answer: Il faut utiliser la commande ci-dessous, car le container est en mode détaché. Le nom du container est : 2049f02f297b +command: docker ps -a +command: docker rename [id] back ## 1.9 -answer: -answer: +answer: docker exec -it back bash +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: -answer: +command: docker run -d -p 1010:1010 -e APP_PORT=1010 -e WS_BACK_URL=172.17.0.1 tombenpotter/microservices-tp2-front +answer: You called at : 2018-11-11 22:03:42.533379 (dynamic) + On environment : dev (from env variable) + With path : test (from URL path) + With front : 1a27478114c6 (from real hostname of front service) + With back : 018cde991272 (from real hostname of back service) + +## 1.11 bis +command: docker exec -it [back_container_id] bash ## 2.1 command: diff --git a/app/back/Dockerfile b/app/back/Dockerfile new file mode 100644 index 0000000..e858442 --- /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 +RUN mkdir logs + +COPY . . + +CMD ["python", "-u", "./webservice.py"] diff --git a/app/front/Dockerfile b/app/front/Dockerfile new file mode 100644 index 0000000..a5d4c00 --- /dev/null +++ b/app/front/Dockerfile @@ -0,0 +1,10 @@ +FROM python:3.7.1-stretch + +COPY requirements.txt ./ + +RUN pip install -r requirements.txt +RUN mkdir logs + +COPY . . + +CMD ["python", "-u", "./front.py"] From c61aa4a3aa1941cd5bf6c86ea97b21a45e0be9ba Mon Sep 17 00:00:00 2001 From: Tombenpotter Date: Sun, 18 Nov 2018 15:55:38 +0100 Subject: [PATCH 3/4] Everything done except for 2.5 and 2.9 --- answers.md | 6 +++--- app/docker-compose.yml | 28 ++++++++++++++++++++++++++++ app/logs/my-messages.log | 3 +++ 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 app/docker-compose.yml create mode 100644 app/logs/my-messages.log diff --git a/answers.md b/answers.md index 167f2b3..938c9ac 100644 --- a/answers.md +++ b/answers.md @@ -54,11 +54,11 @@ answer: You called at : 2018-11-11 22:03:42.533379 (dynamic) command: docker exec -it [back_container_id] bash ## 2.1 -command: +command: docker-compose up ## 2.6 -command: -command: +command: docker-compose up -d +command: docker-compose logs ## 2.9 command: diff --git a/app/docker-compose.yml b/app/docker-compose.yml new file mode 100644 index 0000000..ffd508a --- /dev/null +++ b/app/docker-compose.yml @@ -0,0 +1,28 @@ +version : '3' +services: + service-back: + image: tombenpotter/microservices-tp2:0.1 + ports: + - "8080:8080" + environment: + - ENVIRONMENT=dev + networks: + - backend + expose: + - "8080" +# volumes: +# - "./logs:/logs" + + service-front: + image: tombenpotter/microservices-tp2-front:0.1 + ports: + - "1010:1010" + environment: + - APP_PORT=1010 + - WS_BACK_URL=172.17.0.1 + networks: + - backend + +networks: + backend: + driver: bridge diff --git a/app/logs/my-messages.log b/app/logs/my-messages.log new file mode 100644 index 0000000..663ccef --- /dev/null +++ b/app/logs/my-messages.log @@ -0,0 +1,3 @@ +salut +salut +salut From 389a42be96b0aa02f7ef098315dffaed213dbe1b Mon Sep 17 00:00:00 2001 From: Tombenpotter Date: Mon, 19 Nov 2018 15:43:16 +0100 Subject: [PATCH 4/4] Answer to 2.5 and 2.9 --- answers.md | 2 +- app/docker-compose.yml | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/answers.md b/answers.md index 938c9ac..cada341 100644 --- a/answers.md +++ b/answers.md @@ -61,4 +61,4 @@ command: docker-compose up -d command: docker-compose logs ## 2.9 -command: +command: docker-compose up -d --scale service-back=2 diff --git a/app/docker-compose.yml b/app/docker-compose.yml index ffd508a..36f5176 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -2,14 +2,8 @@ version : '3' services: service-back: image: tombenpotter/microservices-tp2:0.1 - ports: - - "8080:8080" environment: - ENVIRONMENT=dev - networks: - - backend - expose: - - "8080" # volumes: # - "./logs:/logs" @@ -19,10 +13,6 @@ services: - "1010:1010" environment: - APP_PORT=1010 - - WS_BACK_URL=172.17.0.1 - networks: - - backend - -networks: - backend: - driver: bridge + - WS_BACK_URL=backend + links: + - "service-back:backend"