Merge pull request #175 from rstudio/glin-fix-deploy
Fix deploy job; use absolute path for HOME
This commit is contained in:
commit
05d4d3856b
3 changed files with 11 additions and 2 deletions
2
Makefile
2
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):
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -11,7 +11,10 @@ package:
|
|||
- integration/**
|
||||
- builder/**
|
||||
- docs/**
|
||||
# Generated files by other tools
|
||||
- node_modules/**
|
||||
- .npm/**
|
||||
- .cache/**
|
||||
|
||||
provider:
|
||||
name: aws
|
||||
|
|
|
|||
Loading…
Reference in a new issue