From 2b09f017e7719e7c8bdeea87b107250a86c7bc89 Mon Sep 17 00:00:00 2001 From: hrvly Date: Thu, 8 Nov 2018 12:33:08 +0100 Subject: [PATCH 1/5] added name in answer.md Signed-off-by: hrvly --- answers.md | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/answers.md b/answers.md index defa8e2..963e3cd 100644 --- a/answers.md +++ b/answers.md @@ -1,47 +1,45 @@ # Answers -Nom: -Prénom: -NB: +Nom: Ly +Prénom: Hervé +NB: 2 ## 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 2191cd1096ece57b32d688e1e3211a8d3888be39 Mon Sep 17 00:00:00 2001 From: hrvly Date: Thu, 8 Nov 2018 15:09:15 +0100 Subject: [PATCH 2/5] =?UTF-8?q?part=201=20presque=20termin=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hrvly --- answers.md | 47 ++++++++++++++++++++++++++++---------------- app/back/Dockerfile | 10 ++++++++++ app/front/Dockerfile | 11 +++++++++++ 3 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 app/back/Dockerfile create mode 100644 app/front/Dockerfile diff --git a/answers.md b/answers.md index 963e3cd..c5c3dae 100644 --- a/answers.md +++ b/answers.md @@ -5,37 +5,50 @@ Prénom: Hervé NB: 2 ## 1.3 -command: +command: docker run -it --rm --name my-running-app tp2 ## 1.4 -answer: -command: +answer: la connection au port n'est pas autorisée +command: docker run -it --rm --name my-running-app tp2 +docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp my-python-app ## 1.5 -command: +command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine tp2 ## 1.6 -answer: -command: - +answer: le nom de l'image doit correspondre à celui du repository +command: docker login (login dans docker hub) + docker images (pour trouver l'id de mon image) + docker tag 7e16e8a015e5 hrvly/tp2 (tag mon appli docker vers son id docker hub) + docker push hrvly/tp2 (push mon appli vers docker hub) ## 1.7 -answer: -command: -command: -command: +answer: l'image est introuvable localement, docker va donc le télécharger avant de le lancer +command: sudo docker rmi -f $(docker images -q) +command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine hrvly/tp2 +command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine -d hrvly/tp2 ## 1.8 -answer: -command: -command: +answer: nom de mon container: my-running-app, id: c5948d1876e0 +command: docker ps +command: docker rename c5948d1876e0 sens ## 1.9 -answer: -answer: +answer: docker exec -it sens cat /etc/*release +answer: NAME="Alpine Linux" + ID=alpine + VERSION_ID=3.8.1 + PRETTY_NAME="Alpine Linux v3.8" + HOME_URL="http://alpinelinux.org" + BUG_REPORT_URL="http://bugs.alpinelinux.org" ## 1.11 +command: docker run -it --rm --name my-running-app2 -p 8081:8081/tcp -p 8081:8081/udp -e APP_PORT=8081 -e WS_BACK_URL=172.17.0.1 -d hrvly/front +answer: You called at : 2018-11-08 13:50:39.092742 (dynamic) + On environment : python:3-alpine (from env variable) + With path : bonjour (from URL path) + With front : 8b1f466d4822 (from real hostname of front service) + With back : a55d101a7459 (from real hostname of back service) command: -answer: ## 2.1 command: diff --git a/app/back/Dockerfile b/app/back/Dockerfile new file mode 100644 index 0000000..106b153 --- /dev/null +++ b/app/back/Dockerfile @@ -0,0 +1,10 @@ +FROM python:3-alpine + +WORKDIR ./ + +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..8678506 --- /dev/null +++ b/app/front/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3-alpine + +WORKDIR ./ + +COPY requirements.txt ./ +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . + +RUN mkdir logs +CMD [ "python", "-u", "./front.py" ] From 9699e19aea8c14f660ff2846170e64223fada91c Mon Sep 17 00:00:00 2001 From: hrvly Date: Mon, 12 Nov 2018 12:28:22 +0100 Subject: [PATCH 3/5] fin partie 1 Signed-off-by: hrvly --- answers.md | 17 +++++++++-------- app/back/Dockerfile | 7 ++++--- app/front/Dockerfile | 1 - 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/answers.md b/answers.md index c5c3dae..39356dd 100644 --- a/answers.md +++ b/answers.md @@ -5,27 +5,28 @@ Prénom: Hervé NB: 2 ## 1.3 -command: docker run -it --rm --name my-running-app tp2 +command: docker build -t hrvly/back . + docker run -it --rm --name my-running-app hrvly/back ## 1.4 answer: la connection au port n'est pas autorisée -command: docker run -it --rm --name my-running-app tp2 -docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp my-python-app +command: docker run -it --rm --name my-running-app hrvly/back +docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp hrvly/back ## 1.5 -command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine tp2 +command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine hrvly/back ## 1.6 answer: le nom de l'image doit correspondre à celui du repository command: docker login (login dans docker hub) docker images (pour trouver l'id de mon image) - docker tag 7e16e8a015e5 hrvly/tp2 (tag mon appli docker vers son id docker hub) - docker push hrvly/tp2 (push mon appli vers docker hub) + docker tag 7e16e8a015e5 hrvly/back (tag mon appli docker vers son id docker hub) + docker push hrvly/back (push mon appli vers docker hub) ## 1.7 answer: l'image est introuvable localement, docker va donc le télécharger avant de le lancer command: sudo docker rmi -f $(docker images -q) -command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine hrvly/tp2 -command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine -d hrvly/tp2 +command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine hrvly/back +command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine -d hrvly/back ## 1.8 answer: nom de mon container: my-running-app, id: c5948d1876e0 diff --git a/app/back/Dockerfile b/app/back/Dockerfile index 106b153..4cb57c4 100644 --- a/app/back/Dockerfile +++ b/app/back/Dockerfile @@ -1,10 +1,11 @@ FROM python:3-alpine -WORKDIR ./ +WORKDIR /home/rv/micro-service/tp2/app/back + +COPY . . -COPY requirements.txt ./ RUN pip install --no-cache-dir -r requirements.txt -COPY . . +RUN mkdir logs CMD [ "python", "-u", "./webservice.py" ] diff --git a/app/front/Dockerfile b/app/front/Dockerfile index 8678506..c16ee24 100644 --- a/app/front/Dockerfile +++ b/app/front/Dockerfile @@ -7,5 +7,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . -RUN mkdir logs CMD [ "python", "-u", "./front.py" ] From 7a30adda75f84c88f4472018be39777b103f70a7 Mon Sep 17 00:00:00 2001 From: hrvly Date: Mon, 12 Nov 2018 13:34:09 +0100 Subject: [PATCH 4/5] pull parent Signed-off-by: hrvly --- answers.md | 7 +++++-- app/docker-compose.yml | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 app/docker-compose.yml diff --git a/answers.md b/answers.md index 39356dd..d4ebe36 100644 --- a/answers.md +++ b/answers.md @@ -52,8 +52,11 @@ answer: You called at : 2018-11-08 13:50:39.092742 (dynamic) command: ## 2.1 -command: +command: docker-compose up ## 2.6 -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..10f8265 --- /dev/null +++ b/app/docker-compose.yml @@ -0,0 +1,21 @@ +version: '3' +services: + service-back: + image: hrvly/back + expose: + - "8080" + ports: + - "8080:8080" + environment: + - ENVIRONMENT=python:3-alpine + links: + - service-front + service-front: + ports: + - "8081:8081" + image: hrvly/front + environment: + - APP_PORT=8081 + - WS_BACK_URL=172.17.0.1 +volumes: + app-conf:/var/www/html/upload From dde44e7ccfa2c28884e3860f4331de2b7ed205d5 Mon Sep 17 00:00:00 2001 From: hrvly Date: Mon, 19 Nov 2018 15:43:23 +0100 Subject: [PATCH 5/5] fin partie 1 Signed-off-by: hrvly --- answers.md | 2 +- app/docker-compose.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/answers.md b/answers.md index 6726089..2d1cb54 100644 --- a/answers.md +++ b/answers.md @@ -59,4 +59,4 @@ command: docker-compose up -d command: docker-compose logs ## 2.9 -command: +command: docker-compose up -d --scale services-back=2 diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 2b8e4d8..16a4afa 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -2,20 +2,20 @@ version: '3' services: service-back: image: hrvly/back - expose: - - "8080" - ports: - - "8080:8080" +# ports: +# - "8080:8080" environment: - ENVIRONMENT=dev - volumes: - - "logs" +# volumes: +# - "logs" service-front: ports: - "8081:8081" image: hrvly/front environment: - APP_PORT=8081 - - WS_BACK_URL=172.17.0.1 -volumes: - logs: + - WS_BACK_URL=back_end + links: + - "service-back:back_end" +#volumes: +# logs: