Hello community, here is the log from the commit of package yast2-docker for openSUSE:Factory checked in at 2015-04-12 00:10:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-docker (Old) and /work/SRC/openSUSE:Factory/.yast2-docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-docker" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-docker/yast2-docker.changes 2015-03-09 10:09:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-docker.new/yast2-docker.changes 2015-04-12 00:10:52.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 10 13:47:55 UTC 2015 - [email protected] + +- Release 3.1.4 + - Take advantage of 'docker exec' feature and get rid of nsenter. + +------------------------------------------------------------------- Old: ---- yast2-docker-3.1.3.tar.bz2 New: ---- yast2-docker-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-docker.spec ++++++ --- /var/tmp/diff_new_pack.qeeVQh/_old 2015-04-12 00:10:52.000000000 +0200 +++ /var/tmp/diff_new_pack.qeeVQh/_new 2015-04-12 00:10:52.000000000 +0200 @@ -24,15 +24,14 @@ ###################################################################### Name: yast2-docker -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -Requires: docker -Requires: util-linux +Requires: docker >= 1.3 Requires: yast2 >= 3.1.0 Requires: yast2-ruby-bindings >= 1.2.0 Requires: rubygem(docker-api) ++++++ yast2-docker-3.1.3.tar.bz2 -> yast2-docker-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-3.1.3/README.md new/yast2-docker-3.1.4/README.md --- old/yast2-docker-3.1.3/README.md 2015-03-06 15:07:07.000000000 +0100 +++ new/yast2-docker-3.1.4/README.md 2015-04-10 15:52:07.000000000 +0200 @@ -74,9 +74,8 @@ ### Inject terminal inside of a running container Sometimes it can be useful to have a terminal inside of a running container. -This operation can be accomplished by using the `nsenter` tool as explained -by [this](https://blog.docker.com/2014/06/why-you-dont-need-to-run-sshd-in-docker/) -post on Docker Inc's blog. +This operation can be accomplished by using the `docker exec` feature available +since docker 1.3. By pressing the *"Inject terminal"* button a new terminal window is started. Exiting from the new shell session the original **does not** affect the running diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-3.1.3/package/yast2-docker.changes new/yast2-docker-3.1.4/package/yast2-docker.changes --- old/yast2-docker-3.1.3/package/yast2-docker.changes 2015-03-06 15:07:07.000000000 +0100 +++ new/yast2-docker-3.1.4/package/yast2-docker.changes 2015-04-10 15:52:07.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 10 13:47:55 UTC 2015 - [email protected] + +- Release 3.1.4 + - Take advantage of 'docker exec' feature and get rid of nsenter. + +------------------------------------------------------------------- Fri Mar 6 13:46:39 UTC 2015 - [email protected] - Release 3.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-3.1.3/package/yast2-docker.spec new/yast2-docker-3.1.4/package/yast2-docker.spec --- old/yast2-docker-3.1.3/package/yast2-docker.spec 2015-03-06 15:07:07.000000000 +0100 +++ new/yast2-docker-3.1.4/package/yast2-docker.spec 2015-04-10 15:52:07.000000000 +0200 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-docker -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildArch: noarch @@ -34,8 +34,7 @@ Requires: yast2 >= 3.1.0 Requires: yast2-ruby-bindings >= 1.2.0 Requires: rubygem(docker-api) -Requires: docker -Requires: util-linux +Requires: docker >= 1.3 BuildRequires: update-desktop-files BuildRequires: yast2-devtools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-3.1.3/src/lib/ydocker/inject_shell_dialog.rb new/yast2-docker-3.1.4/src/lib/ydocker/inject_shell_dialog.rb --- old/yast2-docker-3.1.3/src/lib/ydocker/inject_shell_dialog.rb 2015-03-06 15:07:07.000000000 +0100 +++ new/yast2-docker-3.1.4/src/lib/ydocker/inject_shell_dialog.rb 2015-04-10 15:52:07.000000000 +0200 @@ -100,19 +100,11 @@ def attach selected_shell = Yast::UI.QueryWidget(:shell, :Value) - pid = `docker inspect --format {{.State.Pid}} #{@container.id}`.chomp - if $?.exitstatus != 0 - error_message = `docker inspect --format {{.State.Pid}} #{@container.id} 2>&1`.chomp - Yast::Popup.Error(_("Failed to inspect container. Error message: %s") % error_message) - return - end - - pid = pid.to_i if Yast::UI.TextMode - Yast::UI.RunInTerminal("nsenter --target #{pid} --mount --uts --ipc --net --pid #{Shellwords.escape selected_shell} 2>&1") + Yast::UI.RunInTerminal("docker exec -ti #{@container.id} #{Shellwords.escape selected_shell} 2>&1") else - res = `xterm -e 'nsenter --target #{pid} --mount --uts --ipc --net --pid #{Shellwords.escape selected_shell} || (echo "Failed to attach. Will close window in 5 seconds";sleep 5)' 2>&1` + res = `xterm -e 'docker exec -ti #{@container.id} #{Shellwords.escape selected_shell} || (echo "Failed to attach. Will close window in 5 seconds";sleep 5)' 2>&1` if $?.exitstatus != 0 Yast::Popup.Error(_("Failed to run terminal. Error: %{error}") % { :error => res }) return
