Skip to content
This repository was archived by the owner on Feb 2, 2022. It is now read-only.

Rename repository to registry for better consistency #47

Merged
merged 1 commit into from
Nov 10, 2020
Merged

Rename repository to registry for better consistency #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Orchestrator/OrchestratorLogic/Orchestrator.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ module ContainerInstances =

type DockerConfig =
{
Repository: string
Registry: string
User: string
Password: string
}
Expand Down Expand Up @@ -292,7 +292,7 @@ module ContainerInstances =
|> Seq.tryPick( fun (k, v) ->
let t = sprintf"{%s}" k
if c.Container.Contains(t, StringComparison.OrdinalIgnoreCase) then
Some (c.Container.Replace(t, v.Repository, StringComparison.OrdinalIgnoreCase))
Some (c.Container.Replace(t, v.Registry, StringComparison.OrdinalIgnoreCase))
else
None
)
Expand Down Expand Up @@ -608,15 +608,15 @@ module ContainerInstances =
let _1_2 =
let dockerConfigs =
dockerConfigs
|> Seq.distinctBy(fun (_, dockerConfig) -> dockerConfig.Repository)
|> Seq.distinctBy(fun (_, dockerConfig) -> dockerConfig.Registry)

if Seq.isEmpty dockerConfigs then
_1_1.WithPublicImageRegistryOnly()
else
let h = snd (Seq.head dockerConfigs)
(_1_1.WithPrivateImageRegistry(h.Repository, h.User, h.Password), Seq.tail dockerConfigs)
(_1_1.WithPrivateImageRegistry(h.Registry, h.User, h.Password), Seq.tail dockerConfigs)
||> Seq.fold(fun a (_, v) ->
a.WithPrivateImageRegistry(v.Repository, v.User, v.Password)
a.WithPrivateImageRegistry(v.Registry, v.User, v.Password)
)

let _1 =
Expand Down