From bc0b750c5d997da412c0a86da77f8a69b450e714 Mon Sep 17 00:00:00 2001 From: zitouni Date: Mon, 12 Nov 2018 07:55:17 -0800 Subject: [PATCH 1/2] premier jet --- answers.md | 52 +++++++++++++++++++++++----------------- answers.md~ | 56 ++++++++++++++++++++++++++++++++++++++++++++ app/back/Dockerfile | 11 +++++++++ app/back/Dockerfile~ | 11 +++++++++ app/back/nohup.out | 2 ++ 5 files changed, 111 insertions(+), 21 deletions(-) create mode 100644 answers.md~ create mode 100644 app/back/Dockerfile create mode 100644 app/back/Dockerfile~ create mode 100644 app/back/nohup.out diff --git a/answers.md b/answers.md index defa8e2..dcadb4a 100644 --- a/answers.md +++ b/answers.md @@ -1,44 +1,54 @@ # Answers -Nom: -Prénom: -NB: +Nom: Grimault +Prénom: Théophile +NB: 6 ## 1.3 -command: +command: sudo docker build . ## 1.4 -answer: -command: +answer: les ports sont fermés +command: sudo docker run -p 8080:8080 tp2 ## 1.5 -command: +command: sudo docker run -e ENVIRONMENT=dev tp2 ## 1.6 -answer: -command: +answer: elle ne peut pas être push car il lui faut un tag +command: sudo docker tag b56321cc8ffc kingsun21/tp2 ## 1.7 -answer: -command: -command: -command: +answer: il faut mettre sudo docker run kingsun21/tp2 au lieu de juste tp2, car + le dépôt n'existe plus localement, mais seulement sur le hub +command: sudo docker rmi -f $(docker images -q) +command: sudo docker run -p 8080:8080 -e ENVIRONMENT=dev kingsun21/tp2 +command: sudo docker run -p 8080:8080 -e ENVIRONMENT=dev -d kingsun21/tp2 ## 1.8 -answer: -command: -command: +answer: le container démarre après avoir été relancé, une fois le terminal + relancé également +command: sudo docker ds +command: sudo docker rename musing_volhard dockername + sudo docker restart dockername ## 1.9 -answer: -answer: +answer: l'OS du container est Debian +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 -p 8081:8081 -e APP_PORT=8081 -e WS_BACK_URL=172.17.0.1 -d tp2front +answer: http://localhost:8081/theophile (With path : theophile) ## 2.1 -command: +command: sudo docker-compose run -p 8080:8080 -e ENVIRONMENT=dev service-back ## 2.6 command: diff --git a/answers.md~ b/answers.md~ new file mode 100644 index 0000000..c4054d7 --- /dev/null +++ b/answers.md~ @@ -0,0 +1,56 @@ +# Answers + +Nom: Grimault +Prénom: Théophile +NB: 6 + +## 1.3 +command: sudo docker build . + +## 1.4 +answer: les ports sont fermés +command: sudo docker run -p 8080:8080 tp2 + +## 1.5 +command: sudo docker run -e ENVIRONMENT=dev tp2 + +## 1.6 +answer: elle ne peut pas être push car il lui faut un tag +command: sudo docker tag b56321cc8ffc kingsun21/tp2 + +## 1.7 +answer: il faut mettre sudo docker run kingsun21/tp2 au lieu de juste tp2 +command: sudo docker rmi -f $(docker images -q) +command: sudo docker run -p 8080:8080 -e ENVIRONMENT=dev kingsun21/tp2 +command: sudo docker run -p 8080:8080 -e ENVIRONMENT=dev -d kingsun21/tp2 + +## 1.8 +answer: le container démarre après avoir été relancé, une fois le terminal + relancé également +command: sudo docker ds +command: sudo docker rename musing_volhard dockername + sudo docker restart dockername + +## 1.9 +answer: l'OS du container est Debian +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: + +## 2.1 +command: + +## 2.6 +command: +command: + + diff --git a/app/back/Dockerfile b/app/back/Dockerfile new file mode 100644 index 0000000..002b2c6 --- /dev/null +++ b/app/back/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3 + +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/back/Dockerfile~ b/app/back/Dockerfile~ new file mode 100644 index 0000000..55e2635 --- /dev/null +++ b/app/back/Dockerfile~ @@ -0,0 +1,11 @@ +FROM python:3 + +WORKDIR /usr/src/app + +COPY requirements.txt ./ + +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . + +CMD ["python", "./webservice.py"] diff --git a/app/back/nohup.out b/app/back/nohup.out new file mode 100644 index 0000000..2d7ab7c --- /dev/null +++ b/app/back/nohup.out @@ -0,0 +1,2 @@ +docker: 'daemon' is not a docker command. +See 'docker --help' From 5fee31130dccf03d77ba14765d050a1f22212e35 Mon Sep 17 00:00:00 2001 From: zitouni Date: Tue, 20 Nov 2018 07:21:43 -0800 Subject: [PATCH 2/2] fini --- answers.md | 8 +++++--- answers.md~ | 15 +++++++++------ app/back/Dockerfile | 4 +++- app/back/Dockerfile~ | 2 +- app/docker-compose.yml | 17 +++++++++++++++++ app/docker-compose.yml~ | 0 6 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 app/docker-compose.yml create mode 100644 app/docker-compose.yml~ diff --git a/answers.md b/answers.md index dcadb4a..6da61de 100644 --- a/answers.md +++ b/answers.md @@ -44,14 +44,16 @@ answer: PRETTY_NAME="Debian GNU/Linux 9 (stretch)" BUG_REPORT_URL="https://bugs.debian.org/" ## 1.11 -command: docker run -p 8081:8081 -e APP_PORT=8081 -e WS_BACK_URL=172.17.0.1 -d tp2front +command: sudo docker run -p 8081:8081 -e APP_PORT=8081 -e WS_BACK_URL=172.17.0.1 -d fronttp2 answer: http://localhost:8081/theophile (With path : theophile) ## 2.1 command: sudo docker-compose run -p 8080:8080 -e ENVIRONMENT=dev service-back ## 2.6 -command: -command: +command: sudo docker-compose up +command: sudo docker-compose logs +## 2.9 +command: sudo docker-compose up -d --scale backtp2=2 diff --git a/answers.md~ b/answers.md~ index c4054d7..47a0983 100644 --- a/answers.md~ +++ b/answers.md~ @@ -19,7 +19,8 @@ answer: elle ne peut pas être push car il lui faut un tag command: sudo docker tag b56321cc8ffc kingsun21/tp2 ## 1.7 -answer: il faut mettre sudo docker run kingsun21/tp2 au lieu de juste tp2 +answer: il faut mettre sudo docker run kingsun21/tp2 au lieu de juste tp2, car + le dépôt n'existe plus localement, mais seulement sur le hub command: sudo docker rmi -f $(docker images -q) command: sudo docker run -p 8080:8080 -e ENVIRONMENT=dev kingsun21/tp2 command: sudo docker run -p 8080:8080 -e ENVIRONMENT=dev -d kingsun21/tp2 @@ -43,14 +44,16 @@ answer: PRETTY_NAME="Debian GNU/Linux 9 (stretch)" BUG_REPORT_URL="https://bugs.debian.org/" ## 1.11 -command: -answer: +command: sudo docker run -p 8081:8081 -e APP_PORT=8081 -e WS_BACK_URL=172.17.0.1 -d tp2front +answer: http://localhost:8081/theophile (With path : theophile) ## 2.1 -command: +command: sudo docker-compose run -p 8080:8080 -e ENVIRONMENT=dev service-back ## 2.6 -command: -command: +command: sudo docker-compose up +command: sudo docker-compose logs +## 2.9 +command: sudo docker-compose up -d --scale backtp2=2 diff --git a/app/back/Dockerfile b/app/back/Dockerfile index 002b2c6..8abf7e9 100644 --- a/app/back/Dockerfile +++ b/app/back/Dockerfile @@ -1,6 +1,6 @@ FROM python:3 -WORKDIR /usr/src/app +WORKDIR /usr/src/app/back COPY requirements.txt ./ @@ -8,4 +8,6 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . +RUN mkdir logs + CMD ["python", "-u", "./webservice.py"] diff --git a/app/back/Dockerfile~ b/app/back/Dockerfile~ index 55e2635..002b2c6 100644 --- a/app/back/Dockerfile~ +++ b/app/back/Dockerfile~ @@ -8,4 +8,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . -CMD ["python", "./webservice.py"] +CMD ["python", "-u", "./webservice.py"] diff --git a/app/docker-compose.yml b/app/docker-compose.yml new file mode 100644 index 0000000..46b1dee --- /dev/null +++ b/app/docker-compose.yml @@ -0,0 +1,17 @@ +version: '3' +services: + backtp2: + image: kingsun21/front + environment: + - ENVIRONMENT=dev + #volumes: + #- logs + fronttp2: + image: kingsun21/back + ports: + - "8081:8081" + environment: + - APP_PORT=8081 + - WS_BACK_URL=back + links: + - "backtp2:back" diff --git a/app/docker-compose.yml~ b/app/docker-compose.yml~ new file mode 100644 index 0000000..e69de29