From d49a6c8ccfb9d75f3b2b848977d5000d4a530ce8 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 14 Jul 2022 10:52:46 -0700 Subject: [PATCH 1/3] update docker-env description and add tooltip --- cmd/minikube/cmd/docker-env.go | 2 +- gui/basicview.cpp | 2 ++ site/content/en/docs/commands/docker-env.md | 2 +- translations/de.json | 1 + translations/es.json | 2 +- translations/fr.json | 1 + translations/ja.json | 1 + translations/ko.json | 2 +- translations/pl.json | 1 + translations/ru.json | 2 +- translations/strings.txt | 2 +- translations/zh-CN.json | 1 + 12 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go index 9f41275188..1d98604173 100644 --- a/cmd/minikube/cmd/docker-env.go +++ b/cmd/minikube/cmd/docker-env.go @@ -241,7 +241,7 @@ func waitForAPIServerProcess(cr command.Runner, start time.Time, timeout time.Du var dockerEnvCmd = &cobra.Command{ Use: "docker-env", Short: "Configure environment to use minikube's Docker daemon", - Long: `Sets up docker env variables; similar to '$(docker-machine env)'.`, + Long: `Sets Docker's env variables to point to the Docker instance inside minikube.`, Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/gui/basicview.cpp b/gui/basicview.cpp index 8d19ec9d97..268eb7ce3a 100644 --- a/gui/basicview.cpp +++ b/gui/basicview.cpp @@ -12,6 +12,8 @@ BasicView::BasicView() deleteButton = new QPushButton(tr("Delete")); refreshButton = new QPushButton(tr("Refresh")); dockerEnvButton = new QPushButton(tr("docker-env")); + dockerEnvButton->setToolTip( + "Sets Docker's env variables to point to the Docker instance inside minikube."); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); advancedButton = new QPushButton(tr("Advanced View")); diff --git a/site/content/en/docs/commands/docker-env.md b/site/content/en/docs/commands/docker-env.md index 30bcbc8439..839d4fe73b 100644 --- a/site/content/en/docs/commands/docker-env.md +++ b/site/content/en/docs/commands/docker-env.md @@ -11,7 +11,7 @@ Configure environment to use minikube's Docker daemon ### Synopsis -Sets up docker env variables; similar to '$(docker-machine env)'. +Sets Docker's env variables to point to the Docker instance inside minikube. ```shell minikube docker-env [flags] diff --git a/translations/de.json b/translations/de.json index 0635de4bd1..bd971849c3 100644 --- a/translations/de.json +++ b/translations/de.json @@ -575,6 +575,7 @@ "Set flag to stop all profiles (clusters)": "Setze Flag um alle Profile (Cluster) zu stoppen", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "Setze Flag um den Cluster nach einer angegebenen Zeit zu stoppen (z.B. --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "Setze dieses Flag um das '.minikube' Verzeichnis aus deinem Benutzer Verzeichnis zu löschen.", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "Setzt einen individuellen Wert in der Minikube Konfigurations-Datei", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "Setzt den Wert von PROPERTY_NAME zu PROPERTY_VALUE\n\tDiese Werte können durch Parameter oder Umgebungsvariablen zur Laufzeit überschrieben werden.", "Sets up docker env variables; similar to '$(docker-machine env)'.": "Setzt Docker env Variablen; ähnlich wie '$(docker-machine env)'.", diff --git a/translations/es.json b/translations/es.json index 8ba0093c15..6e879950b5 100644 --- a/translations/es.json +++ b/translations/es.json @@ -581,9 +581,9 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", - "Sets up docker env variables; similar to '$(docker-machine env)'.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", "Setting profile failed": "", "Show a list of global command-line options (applies to all commands).": "", diff --git a/translations/fr.json b/translations/fr.json index de76b6f707..2255417711 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -559,6 +559,7 @@ "Set flag to stop all profiles (clusters)": "Définir un indicateur pour arrêter tous les profils (clusters)", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "Définir un indicateur pour arrêter le cluster après un laps de temps défini (par exemple, --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "Définissez cet indicateur pour supprimer le dossier '.minikube' de votre répertoire utilisateur.", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "Définit une valeur individuelle dans un fichier de configuration minikube", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "Définit la valeur de configuration PROPERTY_NAME sur PROPERTY_VALUE\n\tCes valeurs peuvent être écrasées par des indicateurs ou des variables d'environnement lors de l'exécution.", "Sets up docker env variables; similar to '$(docker-machine env)'.": "Configure les variables d'environnement docker ; similaire à '$(docker-machine env)'.", diff --git a/translations/ja.json b/translations/ja.json index 2953adc1a8..0c21e03399 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -575,6 +575,7 @@ "Set flag to stop all profiles (clusters)": "全プロファイル (クラスター) を停止します", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "設定時間後にクラスターを停止します (例: --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "あなたのユーザーディレクトリー中の '.minikube' フォルダーを削除します。", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "minikube 設定ファイルの個別の値を設定します", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "PROPERTY_NAME の設定値を PROPERTY_VALUE に設定します\n\tこれらの値はランタイムのフラグまたは環境変数で上書きできます。", "Sets up docker env variables; similar to '$(docker-machine env)'.": "docker 環境変数を設定します。'$(docker-machine env)' と同様です。", diff --git a/translations/ko.json b/translations/ko.json index ff2652b372..ef9bd5b925 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -593,9 +593,9 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", - "Sets up docker env variables; similar to '$(docker-machine env)'.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", "Setting profile failed": "프로필 설정이 실패하였습니다", "Show a list of global command-line options (applies to all commands).": "", diff --git a/translations/pl.json b/translations/pl.json index 76744769f7..1912b0cc69 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -595,6 +595,7 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up docker env variables; similar to '$(docker-machine env)'": "Ustawia zmienne środowiskowe dockera. Podobne do `(docker-machine env)`", diff --git a/translations/ru.json b/translations/ru.json index bf9067b064..327f770eb1 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -541,9 +541,9 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", - "Sets up docker env variables; similar to '$(docker-machine env)'.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", "Setting profile failed": "", "Show a list of global command-line options (applies to all commands).": "", diff --git a/translations/strings.txt b/translations/strings.txt index 7dd30d3eaa..3c2b860c07 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -541,9 +541,9 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", - "Sets up docker env variables; similar to '$(docker-machine env)'.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", "Setting profile failed": "", "Show a list of global command-line options (applies to all commands).": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 899e5e2a89..39ecd92f05 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -675,6 +675,7 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "设置这个标志来删除您用户目录下的 '.minikube' 文件夹。", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up docker env variables; similar to '$(docker-machine env)'": "设置 docker env 变量;类似于 '$(docker-machine env)'", From af662f6b3ac10af7b530a939906204a7a2814d51 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 14 Jul 2022 14:22:11 -0700 Subject: [PATCH 2/3] update wording --- cmd/minikube/cmd/docker-env.go | 9 +++++++-- gui/basicview.cpp | 3 ++- site/content/en/docs/commands/docker-env.md | 11 ++++++++--- translations/de.json | 3 ++- translations/es.json | 3 ++- translations/fr.json | 3 ++- translations/ja.json | 3 ++- translations/ko.json | 4 ++-- translations/pl.json | 4 ++-- translations/ru.json | 4 ++-- translations/strings.txt | 4 ++-- translations/zh-CN.json | 3 ++- 12 files changed, 35 insertions(+), 19 deletions(-) diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go index 1d98604173..2c436b44ec 100644 --- a/cmd/minikube/cmd/docker-env.go +++ b/cmd/minikube/cmd/docker-env.go @@ -240,8 +240,13 @@ func waitForAPIServerProcess(cr command.Runner, start time.Time, timeout time.Du // dockerEnvCmd represents the docker-env command var dockerEnvCmd = &cobra.Command{ Use: "docker-env", - Short: "Configure environment to use minikube's Docker daemon", - Long: `Sets Docker's env variables to point to the Docker instance inside minikube.`, + Short: "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)", + Long: `Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube) + +For example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube. + +Note: You need the docker-cli to be installed on your machine. +docker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps`, Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/gui/basicview.cpp b/gui/basicview.cpp index 268eb7ce3a..1b3a32b835 100644 --- a/gui/basicview.cpp +++ b/gui/basicview.cpp @@ -13,7 +13,8 @@ BasicView::BasicView() refreshButton = new QPushButton(tr("Refresh")); dockerEnvButton = new QPushButton(tr("docker-env")); dockerEnvButton->setToolTip( - "Sets Docker's env variables to point to the Docker instance inside minikube."); + "Opens a terminal where the docker-cli points to docker engine inside minikube (Useful " + "for building docker images directly inside minikube)"); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); advancedButton = new QPushButton(tr("Advanced View")); diff --git a/site/content/en/docs/commands/docker-env.md b/site/content/en/docs/commands/docker-env.md index 839d4fe73b..ae4b2761f0 100644 --- a/site/content/en/docs/commands/docker-env.md +++ b/site/content/en/docs/commands/docker-env.md @@ -1,17 +1,22 @@ --- title: "docker-env" description: > - Configure environment to use minikube's Docker daemon + Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube) --- ## minikube docker-env -Configure environment to use minikube's Docker daemon +Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube) ### Synopsis -Sets Docker's env variables to point to the Docker instance inside minikube. +Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube) + +For example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube. + +Note: You need the docker-cli to be installed on your machine. +docker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps ```shell minikube docker-env [flags] diff --git a/translations/de.json b/translations/de.json index bd971849c3..aaa2225ac3 100644 --- a/translations/de.json +++ b/translations/de.json @@ -503,6 +503,8 @@ "Profile name '{{.profilename}}' is not valid": "Der Profilename '{{.profilename}}' ist nicht valide", "Profile name should be unique": "Der Profilname sollte einzigartig sein", "Provide VM UUID to restore MAC address (hyperkit driver only)": "Geben Sie die VM-UUID an, um die MAC-Adresse wiederherzustellen (nur Hyperkit-Treiber)", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "Ziehe (pull) Images", "Pull the remote image (no caching)": "Ziehe (pull) das Remote Image (kein Caching)", "Pulling base image ...": "Ziehe das Base Image ...", @@ -575,7 +577,6 @@ "Set flag to stop all profiles (clusters)": "Setze Flag um alle Profile (Cluster) zu stoppen", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "Setze Flag um den Cluster nach einer angegebenen Zeit zu stoppen (z.B. --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "Setze dieses Flag um das '.minikube' Verzeichnis aus deinem Benutzer Verzeichnis zu löschen.", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "Setzt einen individuellen Wert in der Minikube Konfigurations-Datei", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "Setzt den Wert von PROPERTY_NAME zu PROPERTY_VALUE\n\tDiese Werte können durch Parameter oder Umgebungsvariablen zur Laufzeit überschrieben werden.", "Sets up docker env variables; similar to '$(docker-machine env)'.": "Setzt Docker env Variablen; ähnlich wie '$(docker-machine env)'.", diff --git a/translations/es.json b/translations/es.json index 6e879950b5..1ca6f412ac 100644 --- a/translations/es.json +++ b/translations/es.json @@ -510,6 +510,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "Permite especificar un UUID de VM para restaurar la dirección MAC (solo con el controlador de hyperkit)", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "", @@ -581,7 +583,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", diff --git a/translations/fr.json b/translations/fr.json index 2255417711..316168ffcc 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -491,6 +491,8 @@ "Profile name '{{.profilename}}' is not valid": "Le nom de profil '{{.profilename}}' n'est pas valide", "Profile name should be unique": "Le nom du profil doit être unique", "Provide VM UUID to restore MAC address (hyperkit driver only)": "Fournit l'identifiant unique universel (UUID) de la VM pour restaurer l'adresse MAC (pilote hyperkit uniquement).", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "Extraction des images", "Pull the remote image (no caching)": "Extraire l'image distante (pas de mise en cache)", "Pulling base image ...": "Extraction de l'image de base...", @@ -559,7 +561,6 @@ "Set flag to stop all profiles (clusters)": "Définir un indicateur pour arrêter tous les profils (clusters)", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "Définir un indicateur pour arrêter le cluster après un laps de temps défini (par exemple, --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "Définissez cet indicateur pour supprimer le dossier '.minikube' de votre répertoire utilisateur.", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "Définit une valeur individuelle dans un fichier de configuration minikube", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "Définit la valeur de configuration PROPERTY_NAME sur PROPERTY_VALUE\n\tCes valeurs peuvent être écrasées par des indicateurs ou des variables d'environnement lors de l'exécution.", "Sets up docker env variables; similar to '$(docker-machine env)'.": "Configure les variables d'environnement docker ; similaire à '$(docker-machine env)'.", diff --git a/translations/ja.json b/translations/ja.json index 0c21e03399..0c7858920f 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -502,6 +502,8 @@ "Profile name '{{.profilename}}' is not valid": "プロファイル名 '{{.profilename}}' は無効です", "Profile name should be unique": "プロファイル名は単一でなければなりません", "Provide VM UUID to restore MAC address (hyperkit driver only)": "MAC アドレスを復元するための VM UUID を指定します (hyperkit ドライバーのみ)", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "イメージを取得します", "Pull the remote image (no caching)": "リモートイメージを取得します (キャッシュなし)", "Pulling base image ...": "ベースイメージを取得しています...", @@ -575,7 +577,6 @@ "Set flag to stop all profiles (clusters)": "全プロファイル (クラスター) を停止します", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "設定時間後にクラスターを停止します (例: --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "あなたのユーザーディレクトリー中の '.minikube' フォルダーを削除します。", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "minikube 設定ファイルの個別の値を設定します", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "PROPERTY_NAME の設定値を PROPERTY_VALUE に設定します\n\tこれらの値はランタイムのフラグまたは環境変数で上書きできます。", "Sets up docker env variables; similar to '$(docker-machine env)'.": "docker 環境変数を設定します。'$(docker-machine env)' と同様です。", diff --git a/translations/ko.json b/translations/ko.json index ef9bd5b925..8a59af7719 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -112,7 +112,6 @@ "Configuration and Management Commands:": "환경 설정 및 관리 명령어:", "Configure a default route on this Linux host, or use another --driver that does not require it": "", "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", - "Configure environment to use minikube's Docker daemon": "", "Configure environment to use minikube's Podman service": "", "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "", "Configuring RBAC rules ...": "RBAC 규칙을 구성하는 중 ...", @@ -524,6 +523,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "베이스 이미지를 다운받는 중 ...", @@ -593,7 +594,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", diff --git a/translations/pl.json b/translations/pl.json index 1912b0cc69..b3a21a6cce 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -108,7 +108,6 @@ "Configuration and Management Commands:": "Polecenia konfiguracji i zarządzania", "Configure a default route on this Linux host, or use another --driver that does not require it": "", "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", - "Configure environment to use minikube's Docker daemon": "", "Configure environment to use minikube's Podman service": "", "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "", "Configuring RBAC rules ...": "Konfigurowanie zasad RBAC ...", @@ -522,6 +521,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "", @@ -595,7 +596,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up docker env variables; similar to '$(docker-machine env)'": "Ustawia zmienne środowiskowe dockera. Podobne do `(docker-machine env)`", diff --git a/translations/ru.json b/translations/ru.json index 327f770eb1..d3439ebad9 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -99,7 +99,6 @@ "Configuration and Management Commands:": "", "Configure a default route on this Linux host, or use another --driver that does not require it": "", "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", - "Configure environment to use minikube's Docker daemon": "", "Configure environment to use minikube's Podman service": "", "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "", "Configuring RBAC rules ...": "", @@ -474,6 +473,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "Скачивается базовый образ ...", @@ -541,7 +542,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", diff --git a/translations/strings.txt b/translations/strings.txt index 3c2b860c07..618de0c47b 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -99,7 +99,6 @@ "Configuration and Management Commands:": "", "Configure a default route on this Linux host, or use another --driver that does not require it": "", "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", - "Configure environment to use minikube's Docker daemon": "", "Configure environment to use minikube's Podman service": "", "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "", "Configuring RBAC rules ...": "", @@ -474,6 +473,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "", @@ -541,7 +542,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 39ecd92f05..e66435295d 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -595,6 +595,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "提供虚拟机 UUID 以恢复 MAC 地址(仅限 hyperkit 驱动程序)", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "", @@ -675,7 +677,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "设置这个标志来删除您用户目录下的 '.minikube' 文件夹。", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up docker env variables; similar to '$(docker-machine env)'": "设置 docker env 变量;类似于 '$(docker-machine env)'", From f1a95fb87aab8dd8d2257fd656bc900a935a3fe0 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 14 Jul 2022 14:24:39 -0700 Subject: [PATCH 3/3] add newline to GUI tooltip --- gui/basicview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/basicview.cpp b/gui/basicview.cpp index 1b3a32b835..52ba216289 100644 --- a/gui/basicview.cpp +++ b/gui/basicview.cpp @@ -13,8 +13,8 @@ BasicView::BasicView() refreshButton = new QPushButton(tr("Refresh")); dockerEnvButton = new QPushButton(tr("docker-env")); dockerEnvButton->setToolTip( - "Opens a terminal where the docker-cli points to docker engine inside minikube (Useful " - "for building docker images directly inside minikube)"); + "Opens a terminal where the docker-cli points to docker engine inside " + "minikube\n(Useful for building docker images directly inside minikube)"); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); advancedButton = new QPushButton(tr("Advanced View"));