Merge pull request #5 from redcode-labs/any-image

added an option to specify a custom docker image

Author: wr0belj

.gitignore

@@ -0,0 +1,3 @@
+easyWSL\bin
+easyWSL\obj
+.vs

.gitignore.txt

@@ -8,12 +8,13 @@
 using System.Threading.Tasks;
 using System.Diagnostics;
 using System.Threading;
+using System.Text.RegularExpressions;
 
 namespace easyWSL
 {
     class DistroInstaller
     {
-        public class TokenFromResponse
+        public class autorizationResponse
         {
             public string token { get; set; }
             public string access_token { get; set; }
@@ -25,7 +26,7 @@ public class TokenFromResponse
         }
 
 
-        public static void InstallDistro(string distroID, string distroName, string distroPath, string easyWSLDataDirectory, string easyWSLDirectory)
+        public static void InstallDistro(string distroImage, string distroName, string distroPath, string easyWSLDataDirectory, string easyWSLDirectory)
         {
 
             void StartProcessSilently(string processName, string processArguments)
@@ -54,6 +55,20 @@ string GetRequest(string url)
                 return responseStream;
             }
 
+            string GetRequestWithHeader(string url, string token, string type)
+            {
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
+                request.Headers.Add("Authorization", "Bearer " + token);
+                request.Accept = type;
+                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+                Stream receiveStream = response.GetResponseStream();
+                StreamReader readStream = new StreamReader(receiveStream, Encoding.UTF8);
+                string responseStream = readStream.ReadToEnd();
+                response.Close();
+                readStream.Close();
+                return responseStream;
+            }
+
             void GetRequestWithHeaderToFile(string url, string token, string type, string fileName)
             {
                 HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
@@ -65,74 +80,80 @@ void GetRequestWithHeaderToFile(string url, string token, string type, string fi
                 byte[] buffer = new byte[bufferSize];
 
                 FileStream fileStream = File.Create(fileName);
-                while((bytesRead = receiveStream.Read(buffer, 0, bufferSize)) != 0)
+                while ((bytesRead = receiveStream.Read(buffer, 0, bufferSize)) != 0)
                 {
                     fileStream.Write(buffer, 0, bytesRead);
                 }
-                
+
                 response.Close();
                 fileStream.Close();
             }
 
 
-            SortedDictionary<string, Sources> sources = JsonSerializer.Deserialize<SortedDictionary<string, Sources>>(File.ReadAllText("sources.json"), new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+            dynamic sources = JsonSerializer.Deserialize<Sources>(File.ReadAllText("sources.json"));
             string repository = "", tag = "", registry = "registry-1.docker.io", authorizationUrl = "https://auth.docker.io/token", registryUrl = "registry.docker.io";
 
-            if (sources[distroID].Image.Contains('/'))
+
+            if (distroImage.Contains('/'))
             {
-                string[] imageArray = sources[distroID].Image.Split('/');
+                string[] imageArray = distroImage.Split('/');
                 tag = "latest";
-                repository = sources[distroID].Image;
+                repository = distroImage;
             }
 
             else
             {
-                string[] imageArray = sources[distroID].Image.Split(':');
+                string[] imageArray = distroImage.Split(':');
                 string imgage = imageArray[0];
                 tag = imageArray[1];
                 repository = $"library/{imgage}";
             }
 
+            dynamic autorizationResponse = JsonSerializer.Deserialize<autorizationResponse>(GetRequest($"{authorizationUrl}?service={registryUrl}&scope=repository:{repository}:pull"));
 
-            dynamic tokenFromResponse = JsonSerializer.Deserialize<TokenFromResponse>(GetRequest($"{authorizationUrl}?service={registryUrl}&scope=repository:{repository}:pull"));
+            string layersResponse = GetRequestWithHeader($"https://{registry}/v2/{repository}/manifests/{tag}", autorizationResponse.token, "application/vnd.docker.distribution.manifest.v2+json");
+
+            MatchCollection layersRegex = Regex.Matches(layersResponse, @"sha256:\w{64}");
+            var layersList = layersRegex.Cast<Match>().Select(match => match.Value).ToList();
+            layersList.RemoveAt(0);
 
             string layersDirectory = $"{easyWSLDataDirectory}\\layers";
             Directory.CreateDirectory(layersDirectory);
 
-            string concatTarCommand = $" cf {layersDirectory}\\install.tar";
+            string concatTarCommand = $" cf {layersDirectory}\\{distroName}-install.tar";
 
             int count = 0;
-            foreach (string layer in sources[distroID].Layers)
+            foreach (string layer in layersList)
             {
                 count++;
                 Console.WriteLine($"Downloading {count}. layer ...");
 
-                tokenFromResponse = JsonSerializer.Deserialize<TokenFromResponse>(GetRequest($"{authorizationUrl}?service={registryUrl}&scope=repository:{repository}:pull"));
+                autorizationResponse = JsonSerializer.Deserialize<autorizationResponse>(GetRequest($"{authorizationUrl}?service={registryUrl}&scope=repository:{repository}:pull"));
 
-                string layerName = $"layer{count}.tar.bz";
+                string layerName = $"{distroName}-layer{count}.tar.bz";
                 string layerPath = $"{layersDirectory}\\{layerName}";
 
-                GetRequestWithHeaderToFile($"https://{registry}/v2/{repository}/blobs/{layer}", tokenFromResponse.token, "application/vnd.docker.distribution.manifest.v2+json", layerPath);
+                GetRequestWithHeaderToFile($"https://{registry}/v2/{repository}/blobs/{layer}", autorizationResponse.token, "application/vnd.docker.distribution.manifest.v2+json", layerPath);
                 concatTarCommand += $" @{layerPath} ";
             }
-
+            
 
             Console.WriteLine("Creating install.tar file ...");
-            if(sources[distroID].Layers.Count == 1)
+            if (layersList.Count == 1)
             {
-                File.Move($"{layersDirectory}\\layer1.tar.bz", $"{layersDirectory}\\install.tar.bz");
+                File.Move($"{layersDirectory}\\{distroName}-layer1.tar.bz", $"{layersDirectory}\\{distroName}-install.tar.bz");
 
                 Console.WriteLine("Registering the distro ...");
-                StartProcessSilently("wsl.exe", $"--import {distroName} {distroPath} {easyWSLDataDirectory}\\layers\\install.tar.bz");
+                StartProcessSilently("wsl.exe", $"--import {distroName} {distroPath} {easyWSLDataDirectory}\\layers\\{distroName}-install.tar.bz");
             }
             else
             {
                 StartProcessSilently($"{easyWSLDirectory}\\dep\\bsdtar.exe", concatTarCommand);
 
                 Console.WriteLine("Registering the distro ...");
-                StartProcessSilently("wsl.exe", $"--import {distroName} {distroPath} {easyWSLDataDirectory}\\layers\\install.tar");
+                StartProcessSilently("wsl.exe", $"--import {distroName} {distroPath} {easyWSLDataDirectory}\\layers\\{distroName}-install.tar");
             }
-            
+
 
             Console.WriteLine("Cleaning up ...");
             Directory.Delete(layersDirectory, true);

.vs/easyWSL/v16/.suo

@@ -30,10 +30,10 @@ static void Main(string[] args)
                 Console.ResetColor();
             }
 
-            SortedDictionary<string, Sources> sources = JsonSerializer.Deserialize<SortedDictionary<string, Sources>>(File.ReadAllText("sources.json"), new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-            
-            string distroID = "", distroName = "", distroPath = "";
-            int distroNumber;
+            dynamic sources = JsonSerializer.Deserialize<Sources>(File.ReadAllText("sources.json"));
+        
+            string distroImage = "", distroName = "", distroPath = "";
+            int distroNumber = 0;
 
             bool isConversionSuccessful;
 
@@ -47,9 +47,9 @@ static void Main(string[] args)
             {
                 foreach (int argument in Enumerable.Range(0, args.Length))
                 {
-                    if ((args[argument] == "-d") ^ (args[argument] == "--distro"))
+                    if ((args[argument] == "-i") ^ (args[argument] == "--image"))
                     {
-                        distroID = args[argument + 1];
+                        distroImage = args[argument + 1];
                     }
 
                     else if ((args[argument] == "-n") ^ (args[argument] == "--name"))
@@ -59,47 +59,64 @@ static void Main(string[] args)
 
                     else if ((args[argument] == "-p") ^ (args[argument] == "--path"))
                     {
-                        distroID = args[argument + 1];
+                        distroPath = args[argument + 1];
                     }
                 }
             }
 
-            if (distroID == "")
+            if (distroImage == "")
             {
                 int count = 1;
-                foreach (KeyValuePair<string, Sources> kvp in sources)
+                foreach (var source in sources.sources)
                 {
-                    Console.WriteLine($"{count}. {sources[kvp.Key].Name}");
+                    Console.WriteLine($"{count}. {source.name}");
                     count++;
                 }
 
+                // additional entry for a custom image option
+                Console.WriteLine($"{count}. Specify a docker image");
+
                 do
                 {
                     Console.Write("A number of a distro you want to install: ");
 
                     isConversionSuccessful = Int32.TryParse(Console.ReadLine(), out distroNumber);
-                } while ((distroNumber > sources.Count) ^ (isConversionSuccessful == false));
-                
-                
+                } while ((distroNumber < 1) ^ (distroNumber > sources.sources.Count + 1) ^ (isConversionSuccessful == false) ^ (distroNumber == 0));
 
-                count = 1;
-                foreach (KeyValuePair<string, Sources> kvp in sources)
+                if(distroNumber == sources.sources.Count+1)
                 {
-                    distroID = kvp.Key;
-                    count++;
-                    if (count > distroNumber)
-                        break;
+                    while (distroImage == "")
+                    {
+                        Console.Write("Specify a docker container: ");
+                        distroImage = Console.ReadLine();
+                    }
+                }
+                else
+                {
+                    distroImage = sources.sources[distroNumber - 1].image;
                 }
             }
-           
+            
             if(distroName == "")
             {
-                Console.Write("A name for your distro (default " + sources[distroID].Name + "): ");
+                if ((distroNumber == sources.sources.Count + 1) || (distroNumber == 0))
+                    Console.Write("A name for your distro: ");
+                else
+                    Console.Write("A name for your distro (default " + sources.sources[distroNumber - 1].name + "): ");
                 distroName = Console.ReadLine();
 
                 if (distroName == "")
                 {
-                    distroName = sources[distroID].Name;
+                    if (distroNumber == sources.sources.Count + 1)
+                    {
+                        while(distroName == "")
+                        {
+                            Console.Write("A name for your distro: ");
+                            distroName = Console.ReadLine();
+                        }
+                    }
+                    else
+                        distroName = sources.sources[distroNumber-1].name;
                 }
 
                 distroName = Regex.Replace(distroName, @"\s+", "");
@@ -124,7 +141,7 @@ static void Main(string[] args)
 
             Directory.CreateDirectory(distroPath);
 
-            DistroInstaller.InstallDistro(distroID, distroName, distroPath, easyWSLDataDirectory, easyWSLDirectory);
+            DistroInstaller.InstallDistro(distroImage, distroName, distroPath, easyWSLDataDirectory, easyWSLDirectory);
         }
     }
 }

easyWSL/DistroInstaller.cs

@@ -8,8 +8,12 @@ namespace easyWSL
 {
     class Sources
     {
-        public string Name { get; set; }
-        public string Image { get; set; }
-        public List<string> Layers { get; set; }
+        public List<SourceProperties> sources { get; set; }
+    }
+
+    public class SourceProperties
+    { 
+        public string image { get; set; }
+        public string name { get; set; }
     }
 }