Skip to content

Commit fade4ae

Browse files
authored
Merge pull request #196 from docker/miscellaneous-fixes-2
Miscellaneous UI fixes
2 parents 0892905 + 548169e commit fade4ae

File tree

7 files changed

+262
-215
lines changed

7 files changed

+262
-215
lines changed

src/extension/ui/src/FileUtils.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export const tryRunImageSync = async (client: v1.DockerDesktopClient, args: stri
1111
try {
1212
const result = await client.docker.cli.exec('run', args)
1313
if (result.stderr) {
14-
console.error(result.stderr)
1514
showError(result.stderr)
1615
}
1716
return result.stdout || ''

src/extension/ui/src/Registry.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export const getRegistry = async (client: v1.DockerDesktopClient) => {
1919
const writeRegistryIfNotExists = async () => {
2020
const registry = await readFileInPromptsVolume(client, 'registry.yaml')
2121
if (!registry) {
22-
console.log('writeRegistryIfNotExists: no registry')
2322
await writeFileToPromptsVolume(client, JSON.stringify({ files: [{ path: 'registry.yaml', content: 'registry: {}' }] }))
2423
}
2524
}
@@ -44,7 +43,6 @@ export const getStoredConfig = async (client: v1.DockerDesktopClient) => {
4443
const writeConfigIfNotExists = async () => {
4544
const config = await readFileInPromptsVolume(client, 'config.yaml')
4645
if (!config) {
47-
console.log('writeConfigIfNotExists: no config')
4846
await writeFileToPromptsVolume(client, JSON.stringify({ files: [{ path: 'config.yaml', content: '{}' }] }))
4947
}
5048
}
@@ -65,14 +63,11 @@ export const getStoredConfig = async (client: v1.DockerDesktopClient) => {
6563
// Replace conflicting config values with registry values
6664
export const syncConfigWithRegistry = async (client: v1.DockerDesktopClient, registry: { [key: string]: { ref: string, config: any } }, config: { [key: string]: { [key: string]: ParsedParameters } }) => {
6765
if (Object.keys(registry).length === 0) {
68-
console.log('No registry to sync with config.')
6966
return;
7067
}
7168
if (Object.keys(config).length === 0) {
72-
console.log('No config to sync with registry.')
7369
return;
7470
}
75-
console.log('SYNC STARTED. REGISTRY -> CONFIG', registry, config)
7671
const oldConfigString = JSON.stringify(config)
7772
for (const [registryItemName, registryItem] of Object.entries(registry)) {
7873
const configInRegistry = registryItem.config
@@ -84,26 +79,19 @@ export const syncConfigWithRegistry = async (client: v1.DockerDesktopClient, reg
8479
}
8580
const newConfigString = JSON.stringify(config)
8681
if (oldConfigString !== newConfigString) {
87-
console.log('Updating config with new registry.', 'oldConfigString', oldConfigString, 'newConfigString', newConfigString)
8882
await writeFileToPromptsVolume(client, JSON.stringify({ files: [{ path: 'config.yaml', content: stringify(config) }] }))
8983
}
90-
else {
91-
console.log('No registry changes to sync with config.', 'oldConfigString', oldConfigString, 'newConfigString', newConfigString)
92-
}
9384
return config
9485
}
9586

9687
// Replace conflicting registry values with config values
9788
export const syncRegistryWithConfig = async (client: v1.DockerDesktopClient, registry: { [key: string]: { ref: string, config: any } }, config: { [key: string]: { [key: string]: ParsedParameters } }) => {
9889
if (Object.keys(config).length === 0) {
99-
console.log('No config to sync with registry.')
10090
return;
10191
}
10292
if (Object.keys(registry).length === 0) {
103-
console.log('No registry to sync with config.')
10493
return;
10594
}
106-
console.log('SYNC STARTED. CONFIG -> REGISTRY', config, registry)
10795
const oldRegString = JSON.stringify(registry)
10896
for (const [itemName, itemConfig] of Object.entries(config)) {
10997
const registryItem = registry[itemName]
@@ -117,11 +105,7 @@ export const syncRegistryWithConfig = async (client: v1.DockerDesktopClient, reg
117105
}
118106
const newRegString = JSON.stringify(registry)
119107
if (oldRegString !== newRegString) {
120-
console.log('Updating registry with new config.', 'oldRegString', oldRegString, 'newRegString', newRegString)
121108
await writeFileToPromptsVolume(client, JSON.stringify({ files: [{ path: 'registry.yaml', content: stringify({ registry }) }] }))
122109
}
123-
else {
124-
console.log('No config changes to sync with registry.', 'oldRegString', oldRegString, 'newRegString', newRegString)
125-
}
126110
return registry
127111
}

0 commit comments

Comments
 (0)