From 220c959d2eaf86fb4acc488f00d46d2829207282 Mon Sep 17 00:00:00 2001 From: s-pace Date: Fri, 26 Apr 2019 08:45:59 +0200 Subject: [PATCH 1/2] build_docker: decode output from commands to comply with python 3 --- cli/src/commands/abstract_build_docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/commands/abstract_build_docker.py b/cli/src/commands/abstract_build_docker.py index df733219..6dc5d091 100644 --- a/cli/src/commands/abstract_build_docker.py +++ b/cli/src/commands/abstract_build_docker.py @@ -8,7 +8,7 @@ def build_docker_file(file, image="algolia/docsearch-scraper-dev", tags = [image] if local_tag: - tag = AbstractBuildDocker.get_local_tag() + tag = AbstractBuildDocker.get_local_tag().decode() tags.append(image + ":" + tag) cmd = ["docker", "build"] + [param for tag in tags for param in From 20c2b59f1276c9e9d48ca953b28f4cdad897dda3 Mon Sep 17 00:00:00 2001 From: s-pace Date: Fri, 26 Apr 2019 08:47:30 +0200 Subject: [PATCH 2/2] Dockerfile.base: install python 3 on scraper --- scraper/dev/docker/Dockerfile.base | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scraper/dev/docker/Dockerfile.base b/scraper/dev/docker/Dockerfile.base index 0bc05859..76cd8072 100644 --- a/scraper/dev/docker/Dockerfile.base +++ b/scraper/dev/docker/Dockerfile.base @@ -13,7 +13,8 @@ RUN chown -R seleuser /home/seleuser RUN chgrp -R seleuser /home/seleuser RUN apt-get update -y && apt-get install -yq \ - software-properties-common + software-properties-common\ + python3.7 RUN add-apt-repository -y ppa:openjdk-r/ppa RUN apt-get update -y && apt-get install -yq \ curl \