From 39f3b8e15efb9004001499ed9966e66cdf11d7ca Mon Sep 17 00:00:00 2001 From: Bruno Cornec Date: Mon, 22 Jan 2018 15:12:39 +0100 Subject: [PATCH 1/3] Move base distribution to Debian stretch --- db/dump/prestashop_fullcustomer.dump.sql | 2 +- microservices/b/Dockerfile | 2 +- microservices/i/Dockerfile | 2 +- microservices/p/Dockerfile | 2 +- microservices/s/Dockerfile | 2 +- microservices/w/Dockerfile | 2 +- microservices/w1/Dockerfile | 2 +- microservices/w2/Dockerfile | 2 +- web/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/db/dump/prestashop_fullcustomer.dump.sql b/db/dump/prestashop_fullcustomer.dump.sql index c3f0385..b2e8691 100644 --- a/db/dump/prestashop_fullcustomer.dump.sql +++ b/db/dump/prestashop_fullcustomer.dump.sql @@ -2,7 +2,7 @@ -- -- Host: localhost Database: localhost -- ------------------------------------------------------ --- Server version 10.1.21-MariaDB-1~jessie +-- Server version 10.1.21-MariaDB-1~stretch /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/microservices/b/Dockerfile b/microservices/b/Dockerfile index 93d9555..b691164 100644 --- a/microservices/b/Dockerfile +++ b/microservices/b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update RUN apt-get install -y python3 diff --git a/microservices/i/Dockerfile b/microservices/i/Dockerfile index 804a420..bede652 100644 --- a/microservices/i/Dockerfile +++ b/microservices/i/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update RUN apt-get install -y python3 diff --git a/microservices/p/Dockerfile b/microservices/p/Dockerfile index ea6cf7b..d9f274e 100644 --- a/microservices/p/Dockerfile +++ b/microservices/p/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update RUN apt-get install -y python3 diff --git a/microservices/s/Dockerfile b/microservices/s/Dockerfile index 8a278ab..a552b11 100644 --- a/microservices/s/Dockerfile +++ b/microservices/s/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update RUN apt-get install -y python3 diff --git a/microservices/w/Dockerfile b/microservices/w/Dockerfile index a72fb39..27f3188 100644 --- a/microservices/w/Dockerfile +++ b/microservices/w/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update RUN apt-get install -y python3 diff --git a/microservices/w1/Dockerfile b/microservices/w1/Dockerfile index cbe272f..62eb428 100644 --- a/microservices/w1/Dockerfile +++ b/microservices/w1/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update RUN apt-get install -y python3 diff --git a/microservices/w2/Dockerfile b/microservices/w2/Dockerfile index bb92eb2..0f181f7 100644 --- a/microservices/w2/Dockerfile +++ b/microservices/w2/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update RUN apt-get install -y python3 diff --git a/web/Dockerfile b/web/Dockerfile index 5160c5d..df083a7 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update RUN apt-get install -y apache2 From c2811d780c96785565b4618550059cb00b871ee8 Mon Sep 17 00:00:00 2001 From: Bruno Cornec Date: Fri, 25 Jan 2019 09:03:57 +0100 Subject: [PATCH 2/3] Use python 3.5 now --- microservices/b/Dockerfile | 2 +- microservices/b/b.py | 2 +- microservices/i/Dockerfile | 4 ++-- microservices/i/README.md | 2 +- microservices/i/i.py | 2 +- microservices/p/Dockerfile | 2 +- microservices/p/p.py | 2 +- microservices/s/Dockerfile | 2 +- microservices/s/s.py | 2 +- microservices/w/Dockerfile | 2 +- microservices/w/w.py | 2 +- microservices/w1/Dockerfile | 2 +- microservices/w1/w1.py | 2 +- microservices/w2/Dockerfile | 2 +- microservices/w2/w2.py | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/microservices/b/Dockerfile b/microservices/b/Dockerfile index b691164..4f8bc2d 100644 --- a/microservices/b/Dockerfile +++ b/microservices/b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -RUN apt-get install -y python3 +RUN apt-get install -y python3.5 RUN apt-get install -y python3-pip RUN apt-get install -y python3-flask RUN pip3 install pika diff --git a/microservices/b/b.py b/microservices/b/b.py index 46e6b64..f187d8a 100755 --- a/microservices/b/b.py +++ b/microservices/b/b.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.5 # -*- coding: utf-8 -*- diff --git a/microservices/i/Dockerfile b/microservices/i/Dockerfile index bede652..1f08ab4 100644 --- a/microservices/i/Dockerfile +++ b/microservices/i/Dockerfile @@ -1,10 +1,10 @@ FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -RUN apt-get install -y python3 +RUN apt-get install -y python3.5 RUN apt-get install -y python3-pip RUN apt-get install -y python3-flask -RUN apt-get install -y libmysqlclient-dev sed +RUN apt-get install -y default-libmysqlclient-dev sed RUN pip3 install mysqlclient RUN useradd i COPY config.py i.conf i.py /home/i/ diff --git a/microservices/i/README.md b/microservices/i/README.md index 9b61211..5ced8f6 100644 --- a/microservices/i/README.md +++ b/microservices/i/README.md @@ -7,7 +7,7 @@ for a specific id. - Python 3 - Flask (python3-flask) -- libmysqlclient-dev +- default-libmysqlclient-dev - python3-pip - pip3 install mysqlclient diff --git a/microservices/i/i.py b/microservices/i/i.py index 99be113..79aa872 100755 --- a/microservices/i/i.py +++ b/microservices/i/i.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.5 # -*- coding: utf-8 -*- diff --git a/microservices/p/Dockerfile b/microservices/p/Dockerfile index d9f274e..2a4d980 100644 --- a/microservices/p/Dockerfile +++ b/microservices/p/Dockerfile @@ -1,7 +1,7 @@ FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -RUN apt-get install -y python3 +RUN apt-get install -y python3.5 RUN apt-get install -y python3-pip RUN apt-get install -y python3-flask RUN apt-get install -y python3-redis sed diff --git a/microservices/p/p.py b/microservices/p/p.py index 7f3b427..d1b1cda 100755 --- a/microservices/p/p.py +++ b/microservices/p/p.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.5 # -*- coding: utf-8 -*- diff --git a/microservices/s/Dockerfile b/microservices/s/Dockerfile index a552b11..1179fb4 100644 --- a/microservices/s/Dockerfile +++ b/microservices/s/Dockerfile @@ -1,7 +1,7 @@ FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -RUN apt-get install -y python3 +RUN apt-get install -y python3.5 RUN apt-get install -y python3-pip RUN apt-get install -y python3-flask RUN apt-get install -y python3-redis sed diff --git a/microservices/s/s.py b/microservices/s/s.py index be8655d..04efaac 100755 --- a/microservices/s/s.py +++ b/microservices/s/s.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.5 # -*- coding: utf-8 -*- diff --git a/microservices/w/Dockerfile b/microservices/w/Dockerfile index 27f3188..be3210d 100644 --- a/microservices/w/Dockerfile +++ b/microservices/w/Dockerfile @@ -1,7 +1,7 @@ FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -RUN apt-get install -y python3 +RUN apt-get install -y python3.5 RUN apt-get install -y python3-pip RUN apt-get install -y python3-flask RUN apt-get install -y imagemagick diff --git a/microservices/w/w.py b/microservices/w/w.py index 1ea3208..ccbc925 100755 --- a/microservices/w/w.py +++ b/microservices/w/w.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.5 # -*- coding: utf-8 -*- diff --git a/microservices/w1/Dockerfile b/microservices/w1/Dockerfile index 62eb428..61c857e 100644 --- a/microservices/w1/Dockerfile +++ b/microservices/w1/Dockerfile @@ -1,7 +1,7 @@ FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -RUN apt-get install -y python3 +RUN apt-get install -y python3.5 RUN apt-get install -y python3-pip RUN apt-get install -y python3-redis sed RUN pip3 install -U pip diff --git a/microservices/w1/w1.py b/microservices/w1/w1.py index b0c5335..554f769 100755 --- a/microservices/w1/w1.py +++ b/microservices/w1/w1.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.5 # Worker 1 called by service B. This worker listen to amqp messages and write # to redis that the user played, and push the image price to swift. diff --git a/microservices/w2/Dockerfile b/microservices/w2/Dockerfile index 0f181f7..5ba9474 100644 --- a/microservices/w2/Dockerfile +++ b/microservices/w2/Dockerfile @@ -1,7 +1,7 @@ FROM debian:stretch ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -RUN apt-get install -y python3 +RUN apt-get install -y python3.5 RUN apt-get install -y python3-pip RUN pip3 install pika RUN useradd w2 diff --git a/microservices/w2/w2.py b/microservices/w2/w2.py index 04aae41..efef94c 100755 --- a/microservices/w2/w2.py +++ b/microservices/w2/w2.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.5 # Worker 1 called by service B. This worker listen to amqp messages and write # to redis that the user played, and push the image price to swift. From 1cac914c56c3b1102a56343deac75dd6bdb52b05 Mon Sep 17 00:00:00 2001 From: Bruno Cornec Date: Wed, 10 Oct 2018 01:57:37 +0200 Subject: [PATCH 3/3] Put registry back to mine --- docker_services.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_services.sh b/docker_services.sh index 9588d9f..0430af9 100755 --- a/docker_services.sh +++ b/docker_services.sh @@ -4,8 +4,8 @@ # # You need to provide your Registry address here: -#REGISTRY=uggla -REGISTRY=registry.uggla.fr +#REGISTRY=registry.uggla.fr +REGISTRY=lab7-2.labossi.hpintelco.org:5500 KEYSTONE=labossi.hpintelco.org MYSQL_ROOT_PASSWORD=toto MYSQL_DATABASE=prestashop