From 936eb8feb6acf7caf3278ee1773d0f15298431ac Mon Sep 17 00:00:00 2001 From: tom doron Date: Thu, 26 May 2022 10:44:10 -0700 Subject: [PATCH] better way to pull --- Plugins/AWSLambdaPackager/Plugin.swift | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Plugins/AWSLambdaPackager/Plugin.swift b/Plugins/AWSLambdaPackager/Plugin.swift index 418bd857..5efa0a15 100644 --- a/Plugins/AWSLambdaPackager/Plugin.swift +++ b/Plugins/AWSLambdaPackager/Plugin.swift @@ -86,11 +86,19 @@ struct AWSLambdaPackager: CommandPlugin { print("building \"\(packageIdentity)\" in docker") print("-------------------------------------------------------------------------") + // update the underlying docker image, if necessary + print("updating \"\(baseImage)\" docker image") + try self.execute( + executable: dockerToolPath, + arguments: ["pull", baseImage], + logLevel: .output + ) + // get the build output path let buildOutputPathCommand = "swift build -c \(buildConfiguration.rawValue) --show-bin-path" let dockerBuildOutputPath = try self.execute( executable: dockerToolPath, - arguments: ["run", "--rm", "--pull", "always", "-v", "\(packageDirectory.string):/workspace", "-w", "/workspace", baseImage, "bash", "-cl", buildOutputPathCommand], + arguments: ["run", "--rm", "-v", "\(packageDirectory.string):/workspace", "-w", "/workspace", baseImage, "bash", "-cl", buildOutputPathCommand], logLevel: verboseLogging ? .debug : .silent ) guard let buildPathOutput = dockerBuildOutputPath.split(separator: "\n").last else {