From 7277db25f9b1a8a3efa03d9188f076906eea8044 Mon Sep 17 00:00:00 2001 From: HadrienTexier Date: Thu, 8 Nov 2018 12:34:58 +0100 Subject: [PATCH 1/5] Step 1 Signed-off-by: HadrienTexier --- answers.md | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/answers.md b/answers.md index defa8e2..2c2b0cd 100644 --- a/answers.md +++ b/answers.md @@ -1,47 +1,45 @@ # Answers -Nom: -Prénom: -NB: +Nom: TEXIER +Prénom: Hadrien +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 70aa0761ebe0a5471e2e2823097d28406555c7cf Mon Sep 17 00:00:00 2001 From: HadrienTexier Date: Thu, 8 Nov 2018 14:53:16 +0100 Subject: [PATCH 2/5] End Part 1 Signed-off-by: HadrienTexier --- answers.md | 44 +++++++++++++++++++++++++++----------------- app/back/Dockerfile | 11 +++++++++++ app/front/Dockerfile | 11 +++++++++++ 3 files changed, 49 insertions(+), 17 deletions(-) create mode 100644 app/back/Dockerfile create mode 100644 app/front/Dockerfile diff --git a/answers.md b/answers.md index 2c2b0cd..263fe5d 100644 --- a/answers.md +++ b/answers.md @@ -5,37 +5,47 @@ Prénom: Hadrien NB: 2 ## 1.3 -command: +command: docker run -it --rm --name my-running-app my-python-app ## 1.4 -answer: -command: +answer: Les ports ne sont pas ouverts +command: 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 my-python-app ## 1.6 -answer: -command: +answer: Le nom de l'image ne correspond au repo il faut donc faire un docker tag +command:docker tag 408808fb1a9e docker.com/hadtex/dockert2pece +docker push hadtex/dockert2pece + ## 1.7 -answer: -command: -command: -command: +answer: l'image n'est pas en local donc il la pull +command: docker rmi -f [NUMIMAGE] +command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine hadtex/dockert2pece +command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080/udp -e ENVIRONMENT=python:3-alpine -d hadtex/dockert2pece ## 1.8 -answer: -command: -command: +answer: my-ruining-app et id ebcf709953f5 +command: docker ps +command: docker restart ebcf709953f5 +docker rename ebcf709953f5 sens + ## 1.9 -answer: -answer: +answer: docker exec -it ebcf709953f5 cat /etc/*release +answer: NAME="Alpine Linux" ## 1.11 -command: -answer: +command: 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 +answer: docker run -it --rm --name my-running-app -p 8081:8081/tcp -p 8081:8081/udp -e APP_PORT=8081 -e WS_BACK_URL=0.0.0.0 my-python-app + ## 2.1 command: diff --git a/app/back/Dockerfile b/app/back/Dockerfile new file mode 100644 index 0000000..67c1739 --- /dev/null +++ b/app/back/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3-alpine + +WORKDIR ./ + +COPY requirements.txt ./ + +RUN pip install -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..aec2b85 --- /dev/null +++ b/app/front/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3-alpine + +WORKDIR ./ + +COPY requirements.txt ./ + +RUN pip install -r requirements.txt + +COPY . . + +CMD [ "python","-u", "front.py" ] From d5333af4aa73bffe4d5db771979d5baf8cc820ca Mon Sep 17 00:00:00 2001 From: HadrienTexier Date: Mon, 12 Nov 2018 12:12:08 +0100 Subject: [PATCH 3/5] Finish part 1 Signed-off-by: HadrienTexier --- answers.md | 4 +++- app/back/Dockerfile | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/answers.md b/answers.md index 263fe5d..83e80cd 100644 --- a/answers.md +++ b/answers.md @@ -44,8 +44,10 @@ command: You called at : 2018-11-08 13:50:39.092742 (dynamic) With path : bonjour (from URL path) With front : 8b1f466d4822 (from real hostname of front service) With back : a55d101a7459 (from real hostname of back service -answer: docker run -it --rm --name my-running-app -p 8081:8081/tcp -p 8081:8081/udp -e APP_PORT=8081 -e WS_BACK_URL=0.0.0.0 my-python-app +answer: docker run -it --rm --name my-running-app -p 8081:8081/tcp -p 8081:8081/udp -e APP_PORT=8081 -e WS_BACK_URL=172.17.0.1 my-python-app +## 1.11 bis +command: docker exec -it 42790a6aa754 cat logs/my-messages.log ## 2.1 command: diff --git a/app/back/Dockerfile b/app/back/Dockerfile index 67c1739..8c3f3ca 100644 --- a/app/back/Dockerfile +++ b/app/back/Dockerfile @@ -8,4 +8,6 @@ RUN pip install -r requirements.txt COPY . . +RUN mkdir logs + CMD [ "python","-u", "webservice.py" ] From c0d6bbd85a62d9b3cfc48cf7cd2857354f9a3705 Mon Sep 17 00:00:00 2001 From: HadrienTexier Date: Wed, 21 Nov 2018 18:58:33 +0100 Subject: [PATCH 4/5] Answer 2.6 Signed-off-by: HadrienTexier --- answers.md | 16 +++++++--------- app/docker-compose.yml | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 app/docker-compose.yml diff --git a/answers.md b/answers.md index e80d2f7..f7a1a4b 100644 --- a/answers.md +++ b/answers.md @@ -5,7 +5,8 @@ Prénom: Hadrien NB: 2 ## 1.3 -command: docker run -it --rm --name my-running-app my-python-app +command: docker build -t my-python-app ./ +docker run -it --rm --name my-running-app my-python-app ## 1.4 answer: Les ports ne sont pas ouverts @@ -17,7 +18,7 @@ command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080 ## 1.6 answer: Le nom de l'image ne correspond au repo il faut donc faire un docker tag -command:docker tag 408808fb1a9e docker.com/hadtex/dockert2pece +command:docker tag 408808fb1a9e hadtex/dockert2pece docker push hadtex/dockert2pece @@ -30,8 +31,7 @@ command: docker run -it --rm --name my-running-app -p 8080:8080/tcp -p 8080:8080 ## 1.8 answer: my-ruining-app et id ebcf709953f5 command: docker ps -command: docker restart ebcf709953f5 -docker rename ebcf709953f5 sens +command: docker rename ebcf709953f5 sens ## 1.9 @@ -50,14 +50,12 @@ answer: docker run -it --rm --name my-running-app -p 8081:8081/tcp -p 8081:8081/ command: docker exec -it 42790a6aa754 cat logs/my-messages.log ## 2.1 -command: +command: docker-compose up ## 2.6 -command: -command: +command: docker-compose up -d +command: docker-compose logs -command: -command: ## 2.9 command: diff --git a/app/docker-compose.yml b/app/docker-compose.yml new file mode 100644 index 0000000..3cfc39f --- /dev/null +++ b/app/docker-compose.yml @@ -0,0 +1,15 @@ +version: '2' +services: + back-service: + ports: + - "8080:8080" + environment: + - ENVIRONMENT=python:3-alpine + image: hadtex/dockert2pece + front-service: + ports: + - "8081:8081" + environment: + - APP_PORT=8081 + - WS_BACK_URL=172.17.0.1 + image: hadtex/fronttp2 From 45a9ddb2f8ee7c6ab2c2facc9542ea2ab5611f7a Mon Sep 17 00:00:00 2001 From: HadrienTexier Date: Wed, 21 Nov 2018 19:12:40 +0100 Subject: [PATCH 5/5] Finish part 2 Signed-off-by: HadrienTexier --- answers.md | 2 +- app/docker-compose.yml | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/answers.md b/answers.md index f7a1a4b..633aa80 100644 --- a/answers.md +++ b/answers.md @@ -58,4 +58,4 @@ command: docker-compose logs ## 2.9 -command: +command: docker-compose up -d --scale back-service=2 diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 3cfc39f..7b008b2 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -1,15 +1,17 @@ version: '2' services: back-service: - ports: - - "8080:8080" environment: - ENVIRONMENT=python:3-alpine image: hadtex/dockert2pece + # volumes: + # - "./logs:/logs" front-service: ports: - "8081:8081" environment: - APP_PORT=8081 - - WS_BACK_URL=172.17.0.1 + - WS_BACK_URL=backend image: hadtex/fronttp2 + links: + - "back-service:backend"