Configure GHCR credentials in configure command (#68)

github · Aug 10, 2022 · 33c7449 · 33c7449
1 parent 8c451a8
commit 33c7449
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Valet/App.cs b/src/Valet/App.cs
@@ -23,9 +23,17 @@ public async Task<int> UpdateValetAsync(string? username = null, string? passwor
     {
         await _dockerService.VerifyDockerRunningAsync().ConfigureAwait(false);
 
+        var environmentVariables = await _configurationService.ReadCurrentVariablesAsync().ConfigureAwait(false);
+
         username ??= Environment.GetEnvironmentVariable("GHCR_USERNAME");
         password ??= Environment.GetEnvironmentVariable("GHCR_PASSWORD");
 
+        if (username == null)
+            environmentVariables.TryGetValue("GHCR_USERNAME", out username);
+
+        if (password == null)
+            environmentVariables.TryGetValue("GHCR_PASSWORD", out password);
+
         await _dockerService.UpdateImageAsync(
             ValetImage,
             ValetContainerRegistry,

diff --git a/src/Valet/Constants.cs b/src/Valet/Constants.cs
@@ -6,6 +6,8 @@ public static class Constants
 {
     private static readonly List<Variable> UserInputVariables = new()
     {
+        new Variable("GHCR_USERNAME", Provider.GitHub, "GitHub handle used to authenticate with the GitHub Container Registry"),
+        new Variable("GHCR_PASSWORD", Provider.GitHub, "Personal access token to authenticate with the GitHub Container Registry"),
         new Variable("GITHUB_ACCESS_TOKEN", Provider.GitHub, "Personal access token for GitHub"),
         new Variable("GITHUB_INSTANCE_URL", Provider.GitHub, "Base url of the GitHub instance", "https://github.com"),
         new Variable("AZURE_DEVOPS_ACCESS_TOKEN", Provider.AzureDevOps, "Personal access token for Azure DevOps"),