github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: pull pass from env var

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2024-01-18 22:27:07 -05:00
parent 27b82f77a3
commit 4650585ded
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/scheduler-k3s/src/triggers/triggers.go
View File

@@ -38,8 +38,7 @@ func main() {
case "post-registry-login": case "post-registry-login":
server := flag.Arg(0) server := flag.Arg(0)
username := flag.Arg(1) username := flag.Arg(1)
password := flag.Arg(2) err = scheduler_k3s.TriggerPostRegistryLogin(server, username)
err = scheduler_k3s.TriggerPostRegistryLogin(server, username, password)
case "report": case "report":
appName := flag.Arg(0) appName := flag.Arg(0)
err = scheduler_k3s.ReportSingleApp(appName, "", "") err = scheduler_k3s.ReportSingleApp(appName, "", "")

4
plugins/scheduler-k3s/triggers.go
View File

@@ -79,11 +79,13 @@ func TriggerPostDelete(appName string) error {
// TriggerPostRegistryLogin updates the `/etc/rancher/k3s/registries.yaml` to include // TriggerPostRegistryLogin updates the `/etc/rancher/k3s/registries.yaml` to include
// auth information for the registry. Note that if the file does not exist, it won't be updated. // auth information for the registry. Note that if the file does not exist, it won't be updated.
func TriggerPostRegistryLogin(server string, username string, password string) error { func TriggerPostRegistryLogin(server string, username string) error {
if !common.FileExists("/usr/local/bin/k3s") { if !common.FileExists("/usr/local/bin/k3s") {
return nil return nil
} }
password := os.Getenv("DOCKER_REGISTRY_PASS")
registry := registries.Registry{} registry := registries.Registry{}
yamlFile, err := os.ReadFile(RegistryConfigPath) yamlFile, err := os.ReadFile(RegistryConfigPath)
if err != nil { if err != nil {