diff --git a/Makefile b/Makefile index c67fe72..9b969c5 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ rebuild-all: deps fetch-serverless-custom-file $(SLS_BINARY) invoke stepf -n rBuilds -d '{"force": true}' serverless-deploy.%: deps fetch-serverless-custom-file - $(SLS_BINARY) deploy --stage $* + $(SLS_BINARY) deploy --stage $* --verbose define GEN_TARGETS docker-build-$(platform): diff --git a/deploy.Jenkinsfile b/deploy.Jenkinsfile index 7abcd19..375c674 100644 --- a/deploy.Jenkinsfile +++ b/deploy.Jenkinsfile @@ -3,12 +3,18 @@ pipeline { dockerfile { dir 'jenkins' label 'docker' + // Required for the serverless-python-requirements plugin to install + // Python requirements using the AWS build images, running Docker inside Docker. additionalBuildArgs '--build-arg DOCKER_GID=$(stat -c %g /var/run/docker.sock) --build-arg JENKINS_UID=$(id -u jenkins) --build-arg JENKINS_GID=$(id -g jenkins)' args '-v /var/run/docker.sock:/var/run/docker.sock --group-add docker' } } environment { - HOME = "." + // Set HOME to the workspace for the serverless-python-requirements plugin. + // The plugin uses HOME for its default cache location, which needs to be + // mounted in the separate Python build container. This needs to be an absolute + // path that also exists on the host since we're mounting the Docker socket. + HOME = "${env.WORKSPACE}" } options { ansiColor('xterm') diff --git a/serverless.yml b/serverless.yml index 6f54bb2..3dbf6e8 100644 --- a/serverless.yml +++ b/serverless.yml @@ -11,7 +11,10 @@ package: - integration/** - builder/** - docs/** + # Generated files by other tools - node_modules/** + - .npm/** + - .cache/** provider: name: aws