From 497f56bc81608ad3c81c5642b49f0623c833a228 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Fri, 28 Oct 2016 17:27:37 +0100 Subject: [PATCH 1/3] Move wheel dependency installation to docker build --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3c258990f..d083adc97 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,8 @@ production: ## Set environment to production dependencies: venv ## Install build dependencies mkdir -p ${PIP_ACCEL_CACHE} PIP_ACCEL_CACHE=${PIP_ACCEL_CACHE} ./venv/bin/pip-accel install -r requirements_for_test.txt + pip3 install wheel + pip3 wheel --wheel-dir=wheelhouse -r requirements.txt .PHONY: generate-version-file generate-version-file: ## Generates the app version file @@ -67,8 +69,6 @@ build: dependencies generate-version-file ## Build project .PHONY: build-codedeploy-artifact build-codedeploy-artifact: ## Build the deploy artifact for CodeDeploy - pip3 install wheel - pip3 wheel --wheel-dir=wheelhouse -r requirements.txt mkdir -p target zip -r -x@deploy-exclude.lst target/notifications-api.zip * From c8be8db7422da0074efc69af1d7b8a0de2432498 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Fri, 28 Oct 2016 17:43:27 +0100 Subject: [PATCH 2/3] Use venv for installation --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d083adc97..d1f06a9f7 100644 --- a/Makefile +++ b/Makefile @@ -57,8 +57,8 @@ production: ## Set environment to production dependencies: venv ## Install build dependencies mkdir -p ${PIP_ACCEL_CACHE} PIP_ACCEL_CACHE=${PIP_ACCEL_CACHE} ./venv/bin/pip-accel install -r requirements_for_test.txt - pip3 install wheel - pip3 wheel --wheel-dir=wheelhouse -r requirements.txt + ./venv/bin/pip-accel install wheel + ./venv/bin/pip-accel wheel --wheel-dir=wheelhouse -r requirements.txt .PHONY: generate-version-file generate-version-file: ## Generates the app version file From ebe2ec434194f1817ec66894dbf023c382b5fe1b Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Fri, 28 Oct 2016 17:48:31 +0100 Subject: [PATCH 3/3] Install pip wheel in the dockerfile --- Makefile | 3 +-- docker/Dockerfile-build | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d1f06a9f7..58bfd9b3c 100644 --- a/Makefile +++ b/Makefile @@ -57,8 +57,6 @@ production: ## Set environment to production dependencies: venv ## Install build dependencies mkdir -p ${PIP_ACCEL_CACHE} PIP_ACCEL_CACHE=${PIP_ACCEL_CACHE} ./venv/bin/pip-accel install -r requirements_for_test.txt - ./venv/bin/pip-accel install wheel - ./venv/bin/pip-accel wheel --wheel-dir=wheelhouse -r requirements.txt .PHONY: generate-version-file generate-version-file: ## Generates the app version file @@ -66,6 +64,7 @@ generate-version-file: ## Generates the app version file .PHONY: build build: dependencies generate-version-file ## Build project + ./venv/bin/pip-accel wheel --wheel-dir=wheelhouse -r requirements.txt .PHONY: build-codedeploy-artifact build-codedeploy-artifact: ## Build the deploy artifact for CodeDeploy diff --git a/docker/Dockerfile-build b/docker/Dockerfile-build index 4fa6afb2d..25b071293 100644 --- a/docker/Dockerfile-build +++ b/docker/Dockerfile-build @@ -20,6 +20,7 @@ RUN \ echo "Install global pip packages" \ && pip install \ virtualenv \ - awscli + awscli \ + wheel WORKDIR /var/project