From 12d4252acb0b31d8741d2d5c479461dd748b4529 Mon Sep 17 00:00:00 2001 From: Linus Gasser Date: Fri, 29 May 2026 09:36:45 +0200 Subject: [PATCH] Use docker login credentials from host I had a lot of failures for pulling the docker images lately, so I was looking for a way to connect using docker login. This PR sends the docker login credentials from the host to the swarm server. --- cli/app/deploy.go | 11 +- cli/app/rollback.go | 11 +- cli/app/upgrade.go | 11 +- pkg/i18n/locales/abra.pot | 4572 ++++++++++++++++++++++++++++- pkg/i18n/locales/es.mo | Bin 133151 -> 133118 bytes pkg/i18n/locales/es.po | 5798 ++++++++++++++++++++++++++++++++++--- 6 files changed, 9954 insertions(+), 449 deletions(-) diff --git a/cli/app/deploy.go b/cli/app/deploy.go index 6fbf7cfa..1d10ccff 100644 --- a/cli/app/deploy.go +++ b/cli/app/deploy.go @@ -151,11 +151,12 @@ checkout as-is. Recipe commit hashes are also supported as values for stackName := app.StackName() deployOpts := stack.Deploy{ - Composefiles: composeFiles, - Namespace: stackName, - Prune: false, - ResolveImage: stack.ResolveImageAlways, - Detach: false, + Composefiles: composeFiles, + Namespace: stackName, + Prune: false, + ResolveImage: stack.ResolveImageAlways, + Detach: false, + SendRegistryAuth: true, } compose, err := appPkg.GetAppComposeConfig(app.Name, deployOpts, app.Env) if err != nil { diff --git a/cli/app/rollback.go b/cli/app/rollback.go index 9fd06a0b..f87ed7b4 100644 --- a/cli/app/rollback.go +++ b/cli/app/rollback.go @@ -166,11 +166,12 @@ beforehand. See "abra app backup" for more.`), stackName := app.StackName() deployOpts := stack.Deploy{ - Composefiles: composeFiles, - Namespace: stackName, - Prune: false, - ResolveImage: stack.ResolveImageAlways, - Detach: false, + Composefiles: composeFiles, + Namespace: stackName, + Prune: false, + ResolveImage: stack.ResolveImageAlways, + Detach: false, + SendRegistryAuth: true, } compose, err := appPkg.GetAppComposeConfig(app.Name, deployOpts, app.Env) diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go index 595f6d85..96dc057a 100644 --- a/cli/app/upgrade.go +++ b/cli/app/upgrade.go @@ -178,11 +178,12 @@ beforehand. See "abra app backup" for more.`), stackName := app.StackName() deployOpts := stack.Deploy{ - Composefiles: composeFiles, - Namespace: stackName, - Prune: false, - ResolveImage: stack.ResolveImageAlways, - Detach: false, + Composefiles: composeFiles, + Namespace: stackName, + Prune: false, + ResolveImage: stack.ResolveImageAlways, + Detach: false, + SendRegistryAuth: true, } compose, err := appPkg.GetAppComposeConfig(app.Name, deployOpts, app.Env) diff --git a/pkg/i18n/locales/abra.pot b/pkg/i18n/locales/abra.pot index 0c039967..e3904727 100644 --- a/pkg/i18n/locales/abra.pot +++ b/pkg/i18n/locales/abra.pot @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: \n" "Report-Msgid-Bugs-To: EMAIL\n" - "POT-Creation-Date: 2026-04-11 11:34+0200\n" + "POT-Creation-Date: 2026-05-29 15:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -169,6 +169,11 @@ msgstr "" msgid " ago" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_advise.go:102 +#, c-format +msgid " command %q from snap %q\n" +msgstr "" + #: ./cli/app/remove.go:99 #, c-format msgid "%d config(s) removed successfully" @@ -189,6 +194,43 @@ msgstr "" msgid "%d volumes removed successfully" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/error.go:114 +#, c-format +msgid "%q does not contain an unpacked snap.\n" + "\n" + "Try 'snapcraft prime' in your project directory, then 'snap try' again." +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:417 +#, c-format +msgid "%q left the cohort" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:414 +#, c-format +msgid "%q left the cohort, and switched to the %q channel" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:408 +#, c-format +msgid "%q switched to the %q channel and the %q cohort\n" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:411 +#, c-format +msgid "%q switched to the %q channel\n" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:405 +#, c-format +msgid "%q switched to the %q cohort\n" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:962 +#, c-format +msgid "%s %s mounted from %s\n" +msgstr "" + #: ./pkg/recipe/git.go:197 #, c-format msgid "%s (%s) has locally unstaged changes?" @@ -199,6 +241,26 @@ msgstr "" msgid "%s (created %v)" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/store/store_download.go:757 +#, c-format +msgid "%s (delta)" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:151 +#, c-format +msgid "%s (revision %s) removed\n" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/error.go:206 +#, c-format +msgid "%s (see 'snap help login')" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/error.go:209 +#, c-format +msgid "%s (try with sudo)" +msgstr "" + #: ./cli/internal/deploy.go:113 #, c-format msgid "%s OVERVIEW" @@ -214,6 +276,11 @@ msgstr "" msgid "%s already exists?" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:615 +#, c-format +msgid "%s already installed\n" +msgstr "" + #: ./cli/app/new.go:202 #, c-format msgid "%s created (version: %s)" @@ -224,6 +291,11 @@ msgstr "" msgid "%s currently has these unstaged changes 👇" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:1016 +#, c-format +msgid "%s disabled\n" +msgstr "" + #: ./cli/internal/command.go:70 #, c-format msgid "%s does not exist for %s, use /bin/sh as fallback" @@ -254,6 +326,11 @@ msgstr "" msgid "%s doesn't have a %s function" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:989 +#, c-format +msgid "%s enabled\n" +msgstr "" + #: ./cli/app/move.go:161 ./cli/app/move.go:320 #, c-format msgid "%s failed on %s: output:%s err:%s" @@ -339,17 +416,17 @@ msgstr "" msgid "%s is missing the TYPE env var?" msgstr "" -#: ./cli/app/rollback.go:309 ./cli/app/rollback.go:313 +#: ./cli/app/rollback.go:310 ./cli/app/rollback.go:314 #, c-format msgid "%s is not a downgrade for %s?" msgstr "" -#: ./cli/app/upgrade.go:429 ./cli/app/upgrade.go:433 +#: ./cli/app/upgrade.go:430 ./cli/app/upgrade.go:434 #, c-format msgid "%s is not an upgrade for %s?" msgstr "" -#: ./cli/app/env.go:146 ./cli/app/logs.go:65 ./cli/app/ps.go:62 ./cli/app/restart.go:100 ./cli/app/services.go:55 ./cli/app/undeploy.go:66 ./cli/app/upgrade.go:450 +#: ./cli/app/env.go:146 ./cli/app/logs.go:65 ./cli/app/ps.go:62 ./cli/app/restart.go:100 ./cli/app/services.go:55 ./cli/app/undeploy.go:66 ./cli/app/upgrade.go:451 #, c-format msgid "%s is not deployed?" msgstr "" @@ -364,12 +441,17 @@ msgstr "" msgid "%s is still deployed. Run \"abra app undeploy %s\"" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_debug_migrate.go:75 +#, c-format +msgid "%s migrated their home directories to ~/Snap\n" +msgstr "" + #: ./cli/app/env.go:132 #, c-format msgid "%s missing context, run \"abra server add %s\"?" msgstr "" -#: ./cli/app/deploy.go:194 ./cli/app/upgrade.go:210 +#: ./cli/app/deploy.go:195 ./cli/app/upgrade.go:211 #, c-format msgid "%s missing from %s.env" msgstr "" @@ -389,6 +471,11 @@ msgstr "" msgid "%s not enabled in recipe config, skipping" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:199 +#, c-format +msgid "%s not installed\n" +msgstr "" + #: ./cli/recipe/new.go:57 #, c-format msgid "%s recipe directory already exists?" @@ -404,6 +491,11 @@ msgstr "" msgid "%s removed from pass store" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:153 ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:192 +#, c-format +msgid "%s removed\n" +msgstr "" + #: ./cli/app/new.go:220 #, c-format msgid "%s requires secret generation before deploy, run \"abra app secret generate %s --all\"" @@ -414,6 +506,11 @@ msgstr "" msgid "%s requires secret insertion before deploy (#generate=false)" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:395 +#, c-format +msgid "%s reverted to %s\n" +msgstr "" + #: ./cli/app/new.go:151 #, c-format msgid "%s sanitised as %s for new app" @@ -444,11 +541,36 @@ msgstr "" msgid "%s successfully stored on server" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:365 +#, c-format +msgid "%s was not found in your $PATH. If you've not restarted your session since you installed snapd, try doing that. Please see https://forum.snapcraft.io/t/9469 for more details." +msgstr "" + #: ./cli/app/move.go:213 #, c-format msgid "%s was successfully moved from %s to %s 🎉" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:380 +#, c-format +msgid "%s%s %s from %s installed\n" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:388 +#, c-format +msgid "%s%s %s from %s refreshed\n" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:383 +#, c-format +msgid "%s%s %s installed\n" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:391 +#, c-format +msgid "%s%s %s refreshed\n" +msgstr "" + #: ./cli/recipe/release.go:294 #, c-format msgid "%s+... conflicts with a previous release: %s" @@ -549,25 +671,54 @@ msgstr "" msgid "%s: waiting %d seconds before next retry" msgstr "" -#: ./cli/app/upgrade.go:424 +#: ./cli/app/upgrade.go:425 #, c-format msgid "'%s' is not a known version" msgstr "" -#: ./cli/app/rollback.go:304 ./cli/app/upgrade.go:419 +#: ./cli/app/rollback.go:305 ./cli/app/upgrade.go:420 #, c-format msgid "'%s' is not a known version for %s" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_changes.go:91 +#, c-format +msgid "'snap changes' command expects a snap name, try 'snap tasks %s'" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_get_base_declaration.go:67 +msgid "'snap debug get-base-declaration' is deprecated; use 'snap debug base-declaration'." +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_interfaces.go:77 +msgid "'snap interfaces' is deprecated; use 'snap connections'." +msgstr "" + #: ./cli/app/volume.go:175 msgid "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:831 +msgid "--list does not accept additional arguments" +msgstr "" + #: ./cli/app/cmd.go:125 #, c-format msgid "--local detected, running %s on local work station" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snap_op.go:824 +msgid "--time does not take mode or channel flags" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_run.go:233 +msgid "-r can only be used with --hook" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_help.go:208 +msgid "...more" +msgstr "" + #: ./pkg/lint/recipe.go:261 ./pkg/recipe/files.go:18 #, c-format msgid ".env.sample for %s couldn't be read: %s" @@ -577,6 +728,122 @@ msgstr "" msgid ".env.sample provided" msgstr "" +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_unalias.go:47 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_alias.go:58 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_ack.go:56 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_known.go:66 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/last.go:46 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_advise.go:78 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_unset.go:58 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_set.go:74 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_create_user.go:65 ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_login.go:62 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_sign.go:55 ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_sign_build.go:71 ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_snapshot.go:415 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_known.go:71 +msgid "
" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_interface.go:62 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_create_key.go:49 ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_delete_key.go:49 ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_export_key.go:53 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_get.go:82 ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_wait.go:55 +msgid "" +msgstr "" + +#: ./.devbox/pkg/mod/github.com/snapcore/snapd@v0.0.0-20220810091556-5d140e0875f5/cmd/snap/cmd_reboot.go:72 +msgid "