Skip to content

Commit a2bdc01

Browse files
committed
do docker warning check before default image is set
1 parent 75b343b commit a2bdc01

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ class ServerlessPythonRequirements {
4747
if (options.dockerizePip === 'non-linux') {
4848
options.dockerizePip = process.platform !== 'linux';
4949
}
50+
if (!options.dockerizePip && (options.dockerSsh||options.dockerImage||options.dockerFile)) {
51+
if (!this.warningLogged) {
52+
this.serverless.cli.log(
53+
'WARNING: You provided a docker related option but dockerizePip is set to false.'
54+
);
55+
this.warningLogged = true;
56+
}
57+
}
5058
if (options.dockerImage && options.dockerFile) {
5159
throw new Error(
5260
'Python Requirements: you can provide a dockerImage or a dockerFile option, not both.'
@@ -56,14 +64,6 @@ class ServerlessPythonRequirements {
5664
const defaultImage = `lambci/lambda:build-${this.serverless.service.provider.runtime}`;
5765
options.dockerImage = options.dockerImage || defaultImage;
5866
}
59-
if (!options.dockerizePip && (options.dockerSsh||options.dockerImage||options.dockerFile)) {
60-
if (!this.warningLogged) {
61-
this.serverless.cli.log(
62-
'WARNING: You provided a docker related option but dockerizePip is set to false.'
63-
);
64-
this.warningLogged = true;
65-
}
66-
}
6767
return options;
6868
}
6969

0 commit comments

Comments
 (0)