Add support for tagging / pushing default architecture based images

Author: wlisac

Documentation/Build Process.md

@@ -14,8 +14,11 @@ Below is an example process to add Swift 5.0.1 for aarch64 devices:
 - Run `swift run Run build --swiftVersion 5.0.1` to build all of the new images
 - If you want to test the new device images, you can run `swift run Run test --swiftVersion 5.0.1` again
 - Once all of the images are built and tested, time to push: `swift run Run push --swiftVersion 5.0.1`
-- Run `swift run Run tag-default-images --swiftVersion 5.0.1` to tag default images (images without an OS specified)
-- Run `swift run Run push-default-images --swiftVersion 5.0.1` to push these default images
+- Run `swift run Run tag-default-images --swiftVersion 5.0.1 --buildVariant build` to tag (build) default images (images without an OS specified)
+- Run `swift run Run tag-default-images --swiftVersion 5.0.1 --buildVariant run` to tag (run) default images (images without an OS specified)
+- Run `swift run Run push-default-images --swiftVersion 5.0.1 --buildVariant build` to push these (build) default images
+- Run `swift run Run push-default-images --swiftVersion 5.0.1 --buildVariant run` to push these (run) default images
+- Note that the tag / push default images requires manually specifying build / run variants. We should fix that.
 - Commit these Dockerfiles and update readme with latest release info
 
 Sometimes the build or test scripts will hang. If docker appears idle, try to stop and re-run the script.

Sources/Run/main.swift

@@ -120,7 +120,7 @@ let tagDefaultImages = command(
                                                 baseName: baseName,
                                                 buildVariant: buildVariant)
     builder = Builder()
-    try builder?.tagDefaultDeviceDockerImages(filter: filter)
+    try builder?.tagDefaultDockerImages(filter: filter)
 }
 
 let pushDefaultImages = command(
@@ -138,7 +138,7 @@ let pushDefaultImages = command(
                                                     baseName: baseName,
                                                     buildVariant: buildVariant)
     builder = Builder()
-    try builder?.pushDefaultDeviceDockerImages(filter: filter)
+    try builder?.pushDefaultDockerImages(filter: filter)
 }
 
 let main = Group {

Sources/SwiftOnBalena/Builder.swift

@@ -201,12 +201,41 @@ public class Builder {
         try command.finish()
     }
 
-    public func tagDefaultDeviceDockerImages(filter: ImageDescriptionFilter) throws {
-        let defaultImages = try defaultDeviceDockerImageDescriptions(filter: filter)
-        
+    public func tagDefaultDockerImages(filter: ImageDescriptionFilter) throws {
+        if filter.baseType == nil {
+            let defaultDeviceImages = try defaultDeviceDockerImageDescriptions(filter: filter)
+            try tagDefaultDockerImages(defaultDeviceImages)
+            
+            let defaultArchitectureImages = try defaultArchitectureDockerImageDescriptions(filter: filter)
+            try tagDefaultDockerImages(defaultArchitectureImages)
+        } else {
+            let defaultImages = try defaultDockerImageDescriptions(filter: filter)
+            try tagDefaultDockerImages(defaultImages)
+        }
+    }
+    
+    private func tagDefaultDockerImages(_ images: [ImageDescription], pullImages: Bool = false) throws {
         let context = CustomContext(main)
 
-        defaultImages.forEach { imageDescription in
+        print("Tag Manifest")
+        images.forEach { imageDescription in
+            print("    - \(imageDescription.defaultOSDockerTag)")
+        }
+        print()
+        
+        images.forEach { imageDescription in
+            if pullImages {
+                let pullCommand = context.runAsyncAndPrint(bash: "docker pull \(imageDescription.dockerTag)")
+                currentCommand = pullCommand
+                do {
+                    try pullCommand.finish()
+                    print("Pulled \(imageDescription.dockerTag)")
+                } catch {
+                    print("ERROR: Failed to pull \(imageDescription.dockerTag). Skipping this tag.")
+                    return
+                }
+            }
+            
             let tagCommand = context.runAsyncAndPrint(bash: "docker tag \(imageDescription.dockerTag) \(imageDescription.defaultOSDockerTag)")
             currentCommand = tagCommand
             do {
@@ -218,20 +247,31 @@ public class Builder {
         }
     }
 
-    public func pushDefaultDeviceDockerImages(filter: ImageDescriptionFilter) throws {
-        let defaultImages = try defaultDeviceDockerImageDescriptions(filter: filter)
-        
+    public func pushDefaultDockerImages(filter: ImageDescriptionFilter) throws {
+        if filter.baseType == nil {
+            let defaultDeviceImages = try defaultDeviceDockerImageDescriptions(filter: filter)
+            try pushDefaultDockerImages(defaultDeviceImages)
+            
+            let defaultArchitectureImages = try defaultArchitectureDockerImageDescriptions(filter: filter)
+            try pushDefaultDockerImages(defaultArchitectureImages)
+        } else {
+            let defaultImages = try defaultDockerImageDescriptions(filter: filter)
+            try pushDefaultDockerImages(defaultImages)
+        }
+    }
+    
+    public func pushDefaultDockerImages(_ images: [ImageDescription]) throws {
         let context = CustomContext(main)
 
         print("Push Manifest")
-        defaultImages.forEach { imageDescription in
+        images.forEach { imageDescription in
             print("    - \(imageDescription.defaultOSDockerTag)")
         }
         print()
 
         var failedImages = [ImageDescription]()
 
-        defaultImages.forEach { imageDescription in
+        images.forEach { imageDescription in
             let tagCommand = context.runAsyncAndPrint(bash: "docker push \(imageDescription.defaultOSDockerTag)")
             currentCommand = tagCommand
             do {
@@ -261,16 +301,30 @@ public class Builder {
     }
 
     func defaultDeviceDockerImageDescriptions(filter: ImageDescriptionFilter) throws -> [ImageDescription] {
-        let deviceImageDescriptions = try ImageDescription.imageDescriptions(for: filter).filter { $0.isDeviceBase }
+        var filter = filter
+        filter.baseType = .device
+        return try defaultDockerImageDescriptions(filter: filter)
+    }
+    
+    func defaultArchitectureDockerImageDescriptions(filter: ImageDescriptionFilter) throws -> [ImageDescription] {
+        var filter = filter
+        filter.baseType = .architecture
+        return try defaultDockerImageDescriptions(filter: filter)
+    }
+    
+    private func defaultDockerImageDescriptions(filter: ImageDescriptionFilter) throws -> [ImageDescription] {
+        precondition(filter.baseType != nil)
+        
+        let deviceImageDescriptions = try ImageDescription.imageDescriptions(for: filter)
 
         let groupedByVersion = Dictionary(grouping: deviceImageDescriptions) { $0.swiftVersion }
 
         var defaultImages = [ImageDescription]()
 
         groupedByVersion.forEach { _, imageDescriptions in
-            let groupedByDevice = Dictionary(grouping: imageDescriptions) { $0.base }
+            let groupedByBase = Dictionary(grouping: imageDescriptions) { $0.base }
 
-            groupedByDevice.forEach { _, imageDescriptions in
+            groupedByBase.forEach { _, imageDescriptions in
 
                 var defaultImage: ImageDescription?
                 for os in preferredOperatingSystems() {