fix

SwissLife-OSS · Aug 28, 2024 · c759fb0 · c759fb0
1 parent 359be69
commit c759fb0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/src/Core/ContainerResourceOptions.cs b/src/Core/ContainerResourceOptions.cs
@@ -58,13 +58,22 @@ private static void AddLocalDockerAuthentication(DockerConfiguration containerCo
                     {
                         continue;
                     }
+
+                    var decryptedToken = Convert.FromBase64String(auth.Value.Auth);
+                    var token = System.Text.Encoding.UTF8.GetString(decryptedToken);
+                    var parts = token.Split(':');
+
+                    if (parts.Length != 2)
+                    {
+                        continue;
+                    }
 
                     containerConfig.Registries.Add(new DockerRegistryConfiguration
                     {
                         Name = address.Host,
                         Address = address.ToString(),
-                        Auth = auth.Value.Auth,
-                        Email = auth.Value.Email
+                        Username = parts[0],
+                        Password = parts[1]
                     });
                 }
             }

diff --git a/src/Core/DockerContainerManager.cs b/src/Core/DockerContainerManager.cs
@@ -81,9 +81,7 @@ private AuthConfig GetAuthConfig(DockerRegistryConfiguration registryConfig)
             {
                 Username = string.IsNullOrEmpty(registryConfig.Username)?null:registryConfig.Username,
                 Password = string.IsNullOrEmpty(registryConfig.Password)?null:registryConfig.Password,
-                ServerAddress = registryConfig.Address,
-                Email = string.IsNullOrEmpty(registryConfig.Email)?null:registryConfig.Email,
-                Auth = string.IsNullOrEmpty(registryConfig.Auth)?null:registryConfig.Auth
+                ServerAddress = registryConfig.Address
             };
         }
 

diff --git a/src/Core/DockerRegistryConfiguration.cs b/src/Core/DockerRegistryConfiguration.cs
@@ -36,22 +36,5 @@ public class DockerRegistryConfiguration
         /// The password.
         /// </value>
         public string Password { get; set; }
-
-        /// <summary>
-        /// Gets or sets the registry token
-        /// </summary>
-        /// <value>
-        /// The password.
-        /// </value>
-        public string Auth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the email.
-        /// </summary>
-        /// <value>
-        /// The password.
-        /// </value>
-        public string Email { get; set; }
-
     }
 }