From 47009a45130d2480746213d2061d90cdb892902b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 17 Sep 2014 23:55:06 +0300 Subject: [PATCH] renamed to docker --- lxc-docker.init => docker.init | 26 +++++++++++----------- lxc-docker.service => docker.service | 0 lxc-docker.spec => docker.spec | 33 ++++++++++++++-------------- 3 files changed, 29 insertions(+), 30 deletions(-) rename lxc-docker.init => docker.init (72%) rename lxc-docker.service => docker.service (100%) rename lxc-docker.spec => docker.spec (87%) diff --git a/lxc-docker.init b/docker.init similarity index 72% rename from lxc-docker.init rename to docker.init index b15bafa..d7de878 100755 --- a/lxc-docker.init +++ b/docker.init @@ -21,7 +21,7 @@ # Check that networking is up. if is_yes "${NETWORKING}"; then if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then - msg_network_down "LXC Docker" + msg_network_down "Docker" exit 1 fi else @@ -29,38 +29,38 @@ else fi # Get service config - may override defaults -[ -f /etc/sysconfig/lxc-docker ] && . /etc/sysconfig/lxc-docker +[ -f /etc/sysconfig/docker ] && . /etc/sysconfig/docker pidfile="/var/run/docker.pid" start() { # Check if the service is already running? - if [ -f /var/lock/subsys/lxc-docker ]; then - msg_already_running "LXC Docker" + if [ -f /var/lock/subsys/docker ]; then + msg_already_running "Docker" return fi - msg_starting "LXC Docker" + msg_starting "Docker" daemon --fork /usr/bin/docker -d RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lxc-docker + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/docker } stop() { - if [ ! -f /var/lock/subsys/lxc-docker ]; then - msg_not_running "LXC Docker" + if [ ! -f /var/lock/subsys/docker ]; then + msg_not_running "Docker" return fi # Stop daemons. - msg_stopping "LXC Docker" + msg_stopping "Docker" killproc --pidfile $pidfile docker -TERM - rm -f /var/lock/subsys/lxc-docker + rm -f /var/lock/subsys/docker } condrestart() { - if [ ! -f /var/lock/subsys/lxc-docker ]; then - msg_not_running "LXC Docker" + if [ ! -f /var/lock/subsys/docker ]; then + msg_not_running "Docker" RETVAL=$1 return fi @@ -89,7 +89,7 @@ case "$1" in condrestart 7 ;; status) - status --pidfile $pidfile lxc-docker docker + status --pidfile $pidfile docker docker RETVAL=$? ;; *) diff --git a/lxc-docker.service b/docker.service similarity index 100% rename from lxc-docker.service rename to docker.service diff --git a/lxc-docker.spec b/docker.spec similarity index 87% rename from lxc-docker.spec rename to docker.spec index a23dccf..e17183c 100644 --- a/lxc-docker.spec +++ b/docker.spec @@ -3,12 +3,12 @@ %bcond_with tests # build without tests Summary: Docker: the Linux container engine -Name: lxc-docker +Name: docker Version: 1.1.1 -Release: 1 +Release: 0.1 License: Apache v2.0 Group: Applications/System -Source0: https://github.com/dotcloud/docker/archive/v%{version}/docker-%{version}.tar.gz +Source0: https://github.com/dotcloud/docker/archive/v%{version}/%{name}-%{version}.tar.gz # Source0-md5: 2f1fad2a1c696a46bad6823a43897a6c Source5: %{name}.service Source6: %{name}.init @@ -33,7 +33,8 @@ Suggests: git-core >= 1.7 Suggests: libcgroup Suggests: xz >= 1:4.9 Provides: group(docker) -Patch0: %{name}-nosha.patch +Obsoletes: lxc-docker < 1.1.1 +Patch0: lxc-%{name}-nosha.patch # only runs on x64 hosts for now: # https://github.com/dotcloud/docker/issues/136 # https://github.com/dotcloud/docker/issues/611 @@ -61,14 +62,15 @@ Summary(pl.UTF-8): bashowe uzupełnianie nazw dla Dockera Group: Applications/Shells Requires: %{name} Requires: bash-completion >= 2.0 +Obsoletes: bash-completion-lxc-docker < 1.1.1 %if "%{_rpmversion}" >= "5" BuildArch: noarch %endif -%description -n bash-completion-lxc-docker +%description -n bash-completion-%{name} This package provides bash-completion for Docker. -%description -n bash-completion-lxc-docker -l pl.UTF-8 +%description -n bash-completion-%{name} -l pl.UTF-8 Pakiet ten dostarcza bashowe uzupełnianie nazw dla Dockera. %package -n vim-syntax-%{name} @@ -76,6 +78,7 @@ Summary: Vim syntax: Docker Group: Applications/Editors/Vim Requires: %{name} = %{version}-%{release} Requires: vim-rt >= 4:7.2.170 +Obsoletes: vim-syntax-lxc-docker < 1.1.1 %if "%{_rpmversion}" >= "5" BuildArch: noarch %endif @@ -84,7 +87,7 @@ BuildArch: noarch This plugin provides syntax highlighting in Dockerfile. %prep -%setup -q -n docker-%{version} +%setup -q %patch0 -p1 install -d vendor/src/github.com/dotcloud @@ -105,17 +108,15 @@ go build -v -ldflags "$LDFLAGS" -a ../dockerinit/dockerinit.go %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/etc/rc.d/init.d,%{systemdunitdir},/var/lib/docker/{containers,graph,volumes}} -install -p build/docker $RPM_BUILD_ROOT%{_bindir}/lxc-docker +install -p build/docker $RPM_BUILD_ROOT%{_bindir}/docker install -p build/dockerinit $RPM_BUILD_ROOT%{_bindir}/dockerinit -install -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/lxc-docker.service -install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/lxc-docker -ln -s lxc-docker $RPM_BUILD_ROOT%{_bindir}/docker +install -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir} +install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/docker #cp -p packaging/debian/lxc-docker.1 $RPM_BUILD_ROOT%{_mandir}/man1 # bash completion install -d $RPM_BUILD_ROOT%{bash_compdir} -cp -p contrib/completion/bash/docker $RPM_BUILD_ROOT%{bash_compdir}/lxc-docker -ln -s lxc-docker $RPM_BUILD_ROOT%{bash_compdir}/docker +cp -p contrib/completion/bash/docker $RPM_BUILD_ROOT%{bash_compdir}/docker # vim syntax install -d $RPM_BUILD_ROOT%{_vimdatadir} @@ -146,9 +147,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc README.md CHANGELOG.md CONTRIBUTING.md FIXME LICENSE AUTHORS NOTICE MAINTAINERS -%{systemdunitdir}/lxc-docker.service -%attr(754,root,root) /etc/rc.d/init.d/lxc-docker -%attr(755,root,root) %{_bindir}/lxc-docker +%{systemdunitdir}/docker.service +%attr(754,root,root) /etc/rc.d/init.d/docker %attr(755,root,root) %{_bindir}/docker %attr(755,root,root) %{_bindir}/dockerinit #%{_mandir}/man1/lxc-docker.1* @@ -159,7 +159,6 @@ rm -rf $RPM_BUILD_ROOT %files -n bash-completion-%{name} %defattr(644,root,root,755) -%{bash_compdir}/lxc-docker %{bash_compdir}/docker %files -n vim-syntax-%{name} -- 2.43.0