From 85f12d254c3d799dc86e3814111b1bbe9da53d9b Mon Sep 17 00:00:00 2001 From: Thibaut Dubernet Date: Thu, 2 Aug 2018 14:57:34 +0200 Subject: [PATCH 1/6] fix problem with python version numpy failed to compile using the "latest" version from python:3 using python:3.6 fixes the issue --- {{cookiecutter.project_name}}/services/apistar/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_name}}/services/apistar/Dockerfile b/{{cookiecutter.project_name}}/services/apistar/Dockerfile index 4a683b2..dcadbd3 100644 --- a/{{cookiecutter.project_name}}/services/apistar/Dockerfile +++ b/{{cookiecutter.project_name}}/services/apistar/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3 +FROM python:3.6 WORKDIR /usr/src/app From dbb53a3aeacc56bd1d46ec342d65b15128d6d604 Mon Sep 17 00:00:00 2001 From: Thibaut Dubernet Date: Thu, 2 Aug 2018 15:18:51 +0200 Subject: [PATCH 2/6] add .gitignore as part of template --- {{cookiecutter.project_name}}/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 {{cookiecutter.project_name}}/.gitignore diff --git a/{{cookiecutter.project_name}}/.gitignore b/{{cookiecutter.project_name}}/.gitignore new file mode 100644 index 0000000..bee8a64 --- /dev/null +++ b/{{cookiecutter.project_name}}/.gitignore @@ -0,0 +1 @@ +__pycache__ From 529d6dc7f5a6d6762cf93e5481ac9767ccd045c5 Mon Sep 17 00:00:00 2001 From: Thibaut Dubernet Date: Thu, 2 Aug 2018 16:40:17 +0200 Subject: [PATCH 3/6] add Makefile to configure and run Docker services --- {{cookiecutter.project_name}}/Makefile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 {{cookiecutter.project_name}}/Makefile diff --git a/{{cookiecutter.project_name}}/Makefile b/{{cookiecutter.project_name}}/Makefile new file mode 100644 index 0000000..ce3cc0c --- /dev/null +++ b/{{cookiecutter.project_name}}/Makefile @@ -0,0 +1,17 @@ +.PHONY: jupyter apistar run run-daemon + +run: jupyter apistar + docker-compose up + +run-daemon: + docker-compose up -d + +jupyter: + docker-compose build $@ + +apistar: + docker-compose build $@ + +clean: + docker-compose rm -fv + docker-compose down -v From 53eef6f3fadcb3ec7d239402a13f7727d5196ec1 Mon Sep 17 00:00:00 2001 From: Ivan Mashintsev Date: Tue, 21 Aug 2018 16:46:15 +0300 Subject: [PATCH 4/6] Change scipy-notebook to all-spark-notebook --- {{cookiecutter.project_name}}/services/jupyter/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_name}}/services/jupyter/Dockerfile b/{{cookiecutter.project_name}}/services/jupyter/Dockerfile index ce6bdb2..18fa912 100644 --- a/{{cookiecutter.project_name}}/services/jupyter/Dockerfile +++ b/{{cookiecutter.project_name}}/services/jupyter/Dockerfile @@ -1,4 +1,4 @@ -FROM jupyter/scipy-notebook +FROM jupyter/all-spark-notebook USER root From 5d0799e98e8d0c632b4bfb0bb1d59ac13eacb6b2 Mon Sep 17 00:00:00 2001 From: Ivan Mashintsev Date: Wed, 22 Aug 2018 23:18:39 +0300 Subject: [PATCH 5/6] Add choosing jupyter image --- cookiecutter.json | 1 + 1 file changed, 1 insertion(+) diff --git a/cookiecutter.json b/cookiecutter.json index 0efab97..69bc5d1 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -1,5 +1,6 @@ { "project_name": "project_name", + "jupyter_image": ["base-notebook", "minimal-notebook", "r-notebook", "scipy-notebook", "tensorflow-notebook", "datascience-notebook", "pyspark-notebook", "all-spark-notebook"], "jupyter_password": "changeme1234", "postgres_db_password": "changeme1234", "shared_db_password": "changeme1234", From a71dd5f4d6fea0127bdd868e6d0fbbcdbe14307e Mon Sep 17 00:00:00 2001 From: Ivan Mashintsev Date: Wed, 22 Aug 2018 23:20:01 +0300 Subject: [PATCH 6/6] Transfer jupyter image from cookiecutter to Dockerfile --- {{cookiecutter.project_name}}/services/jupyter/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_name}}/services/jupyter/Dockerfile b/{{cookiecutter.project_name}}/services/jupyter/Dockerfile index 18fa912..80626d5 100644 --- a/{{cookiecutter.project_name}}/services/jupyter/Dockerfile +++ b/{{cookiecutter.project_name}}/services/jupyter/Dockerfile @@ -1,4 +1,4 @@ -FROM jupyter/all-spark-notebook +FROM jupyter/{{cookiecutter.jupyter_image}} USER root