Skip to content

Commit 196a1bd

Browse files
use --quiet instead of checking for pull progress manually
Signed-off-by: Tyler Critchlow <tylerdarincritchlow@gmail.com>
1 parent 9003d32 commit 196a1bd

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

.github/actions/spelling/expect.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ chirico
115115
cidata
116116
cidfile
117117
Cim
118+
clickable
118119
clientcmd
119120
clientset
120121
clonefile

pkg/rancher-desktop/pages/volumes/files/_name.vue

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ export default Vue.extend({
236236
237237
const containerPath = `/volume${this.currentPath}`;
238238
const lsCommand = [
239-
'run', '--rm',
239+
'run', '--rm', '--quiet',
240240
'-v', `${this.volumeName}:/volume:ro`,
241241
'busybox',
242242
'ls', '-la', '--full-time', '--group-directories-first',
@@ -254,13 +254,7 @@ export default Vue.extend({
254254
execOptions
255255
);
256256
257-
// Only treat stderr as an error if it's not a warning or pull progress
258-
const nonErrorPatterns = [
259-
'level=warning', 'Pulling from', 'Pull complete',
260-
'Downloaded', 'Downloading', 'Waiting', 'Verifying', 'Extracting'
261-
];
262-
const isRealError = stderr && !nonErrorPatterns.some(pattern => stderr.includes(pattern));
263-
if (isRealError) {
257+
if (stderr && !stderr.includes('level=warning')) {
264258
throw new Error(stderr);
265259
}
266260

0 commit comments

Comments
 (0)