golang October 2014

golang@lists.fedoraproject.org

10 participants
650 discussions

[cadvisor/f21] Update sources file
by Jan Chaloupka 09 Oct '14

09 Oct '14

commit 2bc86b45dbf6de19e7ee0ffa5bdf28163202fc69 Author: Jan Chaloupka <jchaloup(a)redhat.com> Date: Thu Oct 9 20:35:11 2014 +0200 Update sources file .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..931f884 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/cadvisor-9d158c3.tar.gz diff --git a/sources b/sources index e69de29..f2a0c84 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +dbf2750631c13a131f106ffefbb7af41 cadvisor-9d158c3.tar.gz

1 0

[cadvisor/f20] Move cadvisor.service and cadvisor config file from patch into repo Fix the build, thanks to Lokesh
by Jan Chaloupka 09 Oct '14

09 Oct '14

commit 1d0d583cfa33f77d51e2b799b3aad866da15fb68 Author: Jan Chaloupka <jchaloup(a)redhat.com> Date: Thu Oct 9 16:55:56 2014 +0200 Move cadvisor.service and cadvisor config file from patch into repo Fix the build, thanks to Lokesh cadvisor | 46 ++++++++++++ cadvisor.service | 18 +++++ cadvisor.spec | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 265 insertions(+), 0 deletions(-) --- diff --git a/cadvisor b/cadvisor new file mode 100644 index 0000000..8a2c793 --- /dev/null +++ b/cadvisor @@ -0,0 +1,46 @@ +# config options for cAdvisor +# +# + +# Docker endpoint to connect to +# Default: unix:///var/run/docker.sock +CADVISOR_DOCKER_ENDPOINT="unix:///var/run/docker.sock" + +# Port to listen on +# Default: 8080 +# kubernetes expects it on port 4194 +CADVISOR_PORT="4194" + +# Samples +# Number of samples to keep +# Default: 1024 +CADVISOR_SAMPLES="1024" + +# Storage driver +# Default: none/blank +# +# Available Options: +# - [none] +# - bigquery +# - influxdb +CADVISOR_STORAGE_DRIVER="" + +# Storage driver host +# Default: localhost:8086" +CADVISOR_STORAGE_DRIVER_HOST="localhost:8086" + +# Storage driver password +# Default: root +CADVISOR_STORAGE_DRIVER_PASSWORD="root" + +# Storage driver secure connection +# Default: false +CADVISOR_STORAGE_DRIVER_SECURE="false" + +# Storage driver user +# Default: root +CADVISOR_STORAGE_DRIVER_USER="root" + +# Log to stderr (and thus to journal) +# Default: false +CADVISOR_LOG_TO_STDERR="true" diff --git a/cadvisor.service b/cadvisor.service new file mode 100644 index 0000000..c465783 --- /dev/null +++ b/cadvisor.service @@ -0,0 +1,18 @@ +[Unit] +Description=cAdvisor + +[Service] +EnvironmentFile=/etc/sysconfig/cadvisor +ExecStart=/usr/bin/cadvisor \ + --docker=${CADVISOR_DOCKER_ENDPOINT} \ + --port=${CADVISOR_PORT} \ + --samples=${CADVISOR_SAMPLES} \ + --storage_driver=${CADVISOR_STORAGE_DRIVER} \ + --storage_driver_host=${CADVISOR_STORAGE_DRIVER_HOST} \ + --storage_driver_password=${CADVISOR_STORAGE_DRIVER_PASSWORD} \ + --storage_driver_secure=${CADVISOR_STORAGE_DRIVER_SECURE} \ + --storage_driver_user=${CADVISOR_STORAGE_DRIVER_USER} \ + --logtostderr=${CADVISOR_LOG_TO_STDERR} + +[Install] +WantedBy=multi-user.target diff --git a/cadvisor.spec b/cadvisor.spec new file mode 100644 index 0000000..52ea30e --- /dev/null +++ b/cadvisor.spec @@ -0,0 +1,201 @@ +%global provider github +%global provider_tld com +%global project google +%global repo cadvisor +%global commit 9d158c3d66e8e6d14cfeb1d73695ab18dbc744e8 + +%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +%global gopath %{_datadir}/gocode +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global debug_package %{nil} + +Name: %{repo} +Version: 0.3.0 +Release: 0.4.git%{shortcommit}%{?dist} +Summary: Analyzes resource usage and performance characteristics of running containers +License: ASL 2.0 +URL: https://%{import_path} +Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source1: cadvisor +Source2: cadvisor.service +BuildRequires: docker-io-pkg-devel +BuildRequires: systemd +BuildRequires: glibc-static +BuildRequires: golang >= 1.2.1-3 +BuildRequires: golang(github.com/docker/libcontainer) +BuildRequires: golang(github.com/fsouza/go-dockerclient) +BuildRequires: golang(github.com/coreos/go-systemd) +BuildRequires: golang(github.com/godbus/dbus) +BuildRequires: golang(github.com/kr/text) +BuildRequires: golang(github.com/kr/pretty) +BuildRequires: golang(github.com/influxdb/influxdb/client) +BuildRequires: golang(github.com/stretchr/testify) +BuildRequires: golang(github.com/stretchr/objx) +BuildRequires: golang(github.com/golang/glog) +Requires: docker-io +ExclusiveArch: x86_64 + +%description +%{summary} + +cAdvisor (Container Advisor) provides container users an understanding of the +resource usage and performance characteristics of their running containers. +It is a running daemon that collects, aggregates, processes, and exports +information about running containers. Specifically, for each container it keeps +resource isolation parameters, historical resource usage, histograms of +complete historical resource usage and network statistics. This data is +exported by container and machine-wide. + +cAdvisor currently supports lmctfy containers as well as Docker containers +(those that use the default libcontainer execdriver). Other container backends +can also be added. cAdvisor's container abstraction is based on lmctfy's +so containers are inherently nested hierarchically. + +%package devel +Requires: golang +Summary: Analyzes resource usage and performance characteristics of running containers +Provides: golang(%{import_path}) = %{version}-%{release} +Provides: golang(%{import_path}/advice) = %{version}-%{release} +Provides: golang(%{import_path}/advice/interface) = %{version}-%{release} +Provides: golang(%{import_path}/api) = %{version}-%{release} +Provides: golang(%{import_path}/client) = %{version}-%{release} +Provides: golang(%{import_path}/container) = %{version}-%{release} +Provides: golang(%{import_path}/container/docker) = %{version}-%{release} +Provides: golang(%{import_path}/container/libcontainer) = %{version}-%{release} +Provides: golang(%{import_path}/container/raw) = %{version}-%{release} +Provides: golang(%{import_path}/deploy) = %{version}-%{release} +Provides: golang(%{import_path}/info) = %{version}-%{release} +Provides: golang(%{import_path}/manager) = %{version}-%{release} +Provides: golang(%{import_path}/pages) = %{version}-%{release} +Provides: golang(%{import_path}/pages/static) = %{version}-%{release} +Provides: golang(%{import_path}/sampling) = %{version}-%{release} +Provides: golang(%{import_path}/storage) = %{version}-%{release} +Provides: golang(%{import_path}/storage/cache) = %{version}-%{release} +Provides: golang(%{import_path}/storage/influxdb) = %{version}-%{release} +Provides: golang(%{import_path}/storage/memory) = %{version}-%{release} +Provides: golang(%{import_path}/utils) = %{version}-%{release} +BuildRequires: docker-io-pkg-devel +BuildRequires: golang +BuildRequires: golang(github.com/docker/libcontainer) +BuildRequires: golang(github.com/fsouza/go-dockerclient) +BuildRequires: golang(github.com/coreos/go-systemd) +BuildRequires: golang(github.com/godbus/dbus) +BuildRequires: golang(github.com/kr/text) +BuildRequires: golang(github.com/kr/pretty) +BuildRequires: golang(github.com/influxdb/influxdb/client) +BuildRequires: golang(github.com/stretchr/testify) +BuildRequires: golang(github.com/stretchr/objx) + +%description devel +%{summary} + +cAdvisor (Container Advisor) provides container users an understanding of the +resource usage and performance characteristics of their running containers. +It is a running daemon that collects, aggregates, processes, and exports +information about running containers. Specifically, for each container it keeps +resource isolation parameters, historical resource usage, histograms of +complete historical resource usage and network statistics. This data is +exported by container and machine-wide. + +cAdvisor currently supports lmctfy containers as well as Docker containers +(those that use the default libcontainer execdriver). Other container backends +can also be added. cAdvisor's container abstraction is based on lmctfy's +so containers are inherently nested hierarchically. + +%prep +%setup -n %{name}-%{commit} -q + +%build +mkdir _build + +pushd _build + mkdir -p src/github.com/google + ln -s $(dirs +1 -l) src/github.com/google/cadvisor +popd +export GOPATH=$(pwd)/_build:%{buildroot}%{gopath}:%{gopath} + +go build --ldflags '-extldflags "-static"' github.com/google/cadvisor + +%install +# main package binary +install -d -p %{buildroot}%{_bindir} +install -p -m0755 cadvisor %{buildroot}%{_bindir} + +# install systemd/sysconfig +install -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig/ +install -p -m0660 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name} +install -d -m0755 %{buildroot}%{_unitdir} +install -p -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service + +# devel package golang libs +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/ + +for d in advice api client container deploy info manager pages sampling storage \ + utils +do + cp -pav $d %{buildroot}/%{gopath}/src/%{import_path}/ +done + +%post +%systemd_post cadvisor.service + +%preun +%systemd_preun cadvisor.service + +%postun +%systemd_postun + +%files +%doc AUTHORS CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS LICENSE README.md +%{_bindir}/cadvisor +%{_unitdir}/%{name}.service +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} + +%files devel +%doc AUTHORS CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS LICENSE README.md +%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} +%dir %{gopath}/src/%{import_path} +%dir %{gopath}/src/%{import_path}/api +%dir %{gopath}/src/%{import_path}/client +%dir %{gopath}/src/%{import_path}/container +%dir %{gopath}/src/%{import_path}/deploy +%dir %{gopath}/src/%{import_path}/info +%dir %{gopath}/src/%{import_path}/manager +%dir %{gopath}/src/%{import_path}/pages +%dir %{gopath}/src/%{import_path}/sampling +%dir %{gopath}/src/%{import_path}/storage +%dir %{gopath}/src/%{import_path}/utils +%{gopath}/src/%{import_path}/* +%{gopath}/src/%{import_path}/api/* +%{gopath}/src/%{import_path}/client/* +%{gopath}/src/%{import_path}/container/* +%{gopath}/src/%{import_path}/deploy/* +%{gopath}/src/%{import_path}/info/* +%{gopath}/src/%{import_path}/manager/* +%{gopath}/src/%{import_path}/pages/* +%{gopath}/src/%{import_path}/sampling/* +%{gopath}/src/%{import_path}/storage/* +%{gopath}/src/%{import_path}/utils/* + +%changelog +* Thu Oct 09 2014 jchaloup <jchaloup(a)redhat.com> - 0.3.0-0.4.git9d158c3 +- Move cadvisor.service and cadvisor config file from patch into repo +- Fix the build, thanks to Lokesh + +* Fri Sep 19 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0.3.0-0.3.git9d158c3 +- own parent directory of <gopath</src/<import_path> +- preserve timestamps of copied files in -devel +- use _unitdir macro for systemd install path + +* Fri Sep 12 2014 Eric Paris <eparis(a)redhat.com - 0.3.0-0.2.git9d158c3 +- Log to stderr (and thus journal) by default + +* Thu Sep 11 2014 Eric Paris <eparis(a)redhat.com - 0.3.0-0.1.git9d158c3 +- Bump to upstream 9d158c3d66e8e6d14cfeb1d73695ab18dbc744e8 + +* Wed Aug 20 2014 Eric Paris <eparis(a)redhat.com - 0.2.0-2 +- Bump to upstream 17b0ec576bcbeb321c133e4378dee1e500c9850d + +* Thu Aug 07 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.2.0-1 +- First package for Fedora

1 0

[cadvisor/f21] Move cadvisor.service and cadvisor config file from patch into repo Fix the build, thanks to Lokesh
by Jan Chaloupka 09 Oct '14

09 Oct '14

commit 513923fab1ea5c4fe96bf24dbc005bfbdd669d3c Author: Jan Chaloupka <jchaloup(a)redhat.com> Date: Thu Oct 9 16:55:56 2014 +0200 Move cadvisor.service and cadvisor config file from patch into repo Fix the build, thanks to Lokesh cadvisor | 46 ++++++++++++ cadvisor.service | 18 +++++ cadvisor.spec | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 265 insertions(+), 0 deletions(-) --- diff --git a/cadvisor b/cadvisor new file mode 100644 index 0000000..8a2c793 --- /dev/null +++ b/cadvisor @@ -0,0 +1,46 @@ +# config options for cAdvisor +# +# + +# Docker endpoint to connect to +# Default: unix:///var/run/docker.sock +CADVISOR_DOCKER_ENDPOINT="unix:///var/run/docker.sock" + +# Port to listen on +# Default: 8080 +# kubernetes expects it on port 4194 +CADVISOR_PORT="4194" + +# Samples +# Number of samples to keep +# Default: 1024 +CADVISOR_SAMPLES="1024" + +# Storage driver +# Default: none/blank +# +# Available Options: +# - [none] +# - bigquery +# - influxdb +CADVISOR_STORAGE_DRIVER="" + +# Storage driver host +# Default: localhost:8086" +CADVISOR_STORAGE_DRIVER_HOST="localhost:8086" + +# Storage driver password +# Default: root +CADVISOR_STORAGE_DRIVER_PASSWORD="root" + +# Storage driver secure connection +# Default: false +CADVISOR_STORAGE_DRIVER_SECURE="false" + +# Storage driver user +# Default: root +CADVISOR_STORAGE_DRIVER_USER="root" + +# Log to stderr (and thus to journal) +# Default: false +CADVISOR_LOG_TO_STDERR="true" diff --git a/cadvisor.service b/cadvisor.service new file mode 100644 index 0000000..c465783 --- /dev/null +++ b/cadvisor.service @@ -0,0 +1,18 @@ +[Unit] +Description=cAdvisor + +[Service] +EnvironmentFile=/etc/sysconfig/cadvisor +ExecStart=/usr/bin/cadvisor \ + --docker=${CADVISOR_DOCKER_ENDPOINT} \ + --port=${CADVISOR_PORT} \ + --samples=${CADVISOR_SAMPLES} \ + --storage_driver=${CADVISOR_STORAGE_DRIVER} \ + --storage_driver_host=${CADVISOR_STORAGE_DRIVER_HOST} \ + --storage_driver_password=${CADVISOR_STORAGE_DRIVER_PASSWORD} \ + --storage_driver_secure=${CADVISOR_STORAGE_DRIVER_SECURE} \ + --storage_driver_user=${CADVISOR_STORAGE_DRIVER_USER} \ + --logtostderr=${CADVISOR_LOG_TO_STDERR} + +[Install] +WantedBy=multi-user.target diff --git a/cadvisor.spec b/cadvisor.spec new file mode 100644 index 0000000..52ea30e --- /dev/null +++ b/cadvisor.spec @@ -0,0 +1,201 @@ +%global provider github +%global provider_tld com +%global project google +%global repo cadvisor +%global commit 9d158c3d66e8e6d14cfeb1d73695ab18dbc744e8 + +%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +%global gopath %{_datadir}/gocode +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global debug_package %{nil} + +Name: %{repo} +Version: 0.3.0 +Release: 0.4.git%{shortcommit}%{?dist} +Summary: Analyzes resource usage and performance characteristics of running containers +License: ASL 2.0 +URL: https://%{import_path} +Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source1: cadvisor +Source2: cadvisor.service +BuildRequires: docker-io-pkg-devel +BuildRequires: systemd +BuildRequires: glibc-static +BuildRequires: golang >= 1.2.1-3 +BuildRequires: golang(github.com/docker/libcontainer) +BuildRequires: golang(github.com/fsouza/go-dockerclient) +BuildRequires: golang(github.com/coreos/go-systemd) +BuildRequires: golang(github.com/godbus/dbus) +BuildRequires: golang(github.com/kr/text) +BuildRequires: golang(github.com/kr/pretty) +BuildRequires: golang(github.com/influxdb/influxdb/client) +BuildRequires: golang(github.com/stretchr/testify) +BuildRequires: golang(github.com/stretchr/objx) +BuildRequires: golang(github.com/golang/glog) +Requires: docker-io +ExclusiveArch: x86_64 + +%description +%{summary} + +cAdvisor (Container Advisor) provides container users an understanding of the +resource usage and performance characteristics of their running containers. +It is a running daemon that collects, aggregates, processes, and exports +information about running containers. Specifically, for each container it keeps +resource isolation parameters, historical resource usage, histograms of +complete historical resource usage and network statistics. This data is +exported by container and machine-wide. + +cAdvisor currently supports lmctfy containers as well as Docker containers +(those that use the default libcontainer execdriver). Other container backends +can also be added. cAdvisor's container abstraction is based on lmctfy's +so containers are inherently nested hierarchically. + +%package devel +Requires: golang +Summary: Analyzes resource usage and performance characteristics of running containers +Provides: golang(%{import_path}) = %{version}-%{release} +Provides: golang(%{import_path}/advice) = %{version}-%{release} +Provides: golang(%{import_path}/advice/interface) = %{version}-%{release} +Provides: golang(%{import_path}/api) = %{version}-%{release} +Provides: golang(%{import_path}/client) = %{version}-%{release} +Provides: golang(%{import_path}/container) = %{version}-%{release} +Provides: golang(%{import_path}/container/docker) = %{version}-%{release} +Provides: golang(%{import_path}/container/libcontainer) = %{version}-%{release} +Provides: golang(%{import_path}/container/raw) = %{version}-%{release} +Provides: golang(%{import_path}/deploy) = %{version}-%{release} +Provides: golang(%{import_path}/info) = %{version}-%{release} +Provides: golang(%{import_path}/manager) = %{version}-%{release} +Provides: golang(%{import_path}/pages) = %{version}-%{release} +Provides: golang(%{import_path}/pages/static) = %{version}-%{release} +Provides: golang(%{import_path}/sampling) = %{version}-%{release} +Provides: golang(%{import_path}/storage) = %{version}-%{release} +Provides: golang(%{import_path}/storage/cache) = %{version}-%{release} +Provides: golang(%{import_path}/storage/influxdb) = %{version}-%{release} +Provides: golang(%{import_path}/storage/memory) = %{version}-%{release} +Provides: golang(%{import_path}/utils) = %{version}-%{release} +BuildRequires: docker-io-pkg-devel +BuildRequires: golang +BuildRequires: golang(github.com/docker/libcontainer) +BuildRequires: golang(github.com/fsouza/go-dockerclient) +BuildRequires: golang(github.com/coreos/go-systemd) +BuildRequires: golang(github.com/godbus/dbus) +BuildRequires: golang(github.com/kr/text) +BuildRequires: golang(github.com/kr/pretty) +BuildRequires: golang(github.com/influxdb/influxdb/client) +BuildRequires: golang(github.com/stretchr/testify) +BuildRequires: golang(github.com/stretchr/objx) + +%description devel +%{summary} + +cAdvisor (Container Advisor) provides container users an understanding of the +resource usage and performance characteristics of their running containers. +It is a running daemon that collects, aggregates, processes, and exports +information about running containers. Specifically, for each container it keeps +resource isolation parameters, historical resource usage, histograms of +complete historical resource usage and network statistics. This data is +exported by container and machine-wide. + +cAdvisor currently supports lmctfy containers as well as Docker containers +(those that use the default libcontainer execdriver). Other container backends +can also be added. cAdvisor's container abstraction is based on lmctfy's +so containers are inherently nested hierarchically. + +%prep +%setup -n %{name}-%{commit} -q + +%build +mkdir _build + +pushd _build + mkdir -p src/github.com/google + ln -s $(dirs +1 -l) src/github.com/google/cadvisor +popd +export GOPATH=$(pwd)/_build:%{buildroot}%{gopath}:%{gopath} + +go build --ldflags '-extldflags "-static"' github.com/google/cadvisor + +%install +# main package binary +install -d -p %{buildroot}%{_bindir} +install -p -m0755 cadvisor %{buildroot}%{_bindir} + +# install systemd/sysconfig +install -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig/ +install -p -m0660 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name} +install -d -m0755 %{buildroot}%{_unitdir} +install -p -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service + +# devel package golang libs +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/ + +for d in advice api client container deploy info manager pages sampling storage \ + utils +do + cp -pav $d %{buildroot}/%{gopath}/src/%{import_path}/ +done + +%post +%systemd_post cadvisor.service + +%preun +%systemd_preun cadvisor.service + +%postun +%systemd_postun + +%files +%doc AUTHORS CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS LICENSE README.md +%{_bindir}/cadvisor +%{_unitdir}/%{name}.service +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} + +%files devel +%doc AUTHORS CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS LICENSE README.md +%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} +%dir %{gopath}/src/%{import_path} +%dir %{gopath}/src/%{import_path}/api +%dir %{gopath}/src/%{import_path}/client +%dir %{gopath}/src/%{import_path}/container +%dir %{gopath}/src/%{import_path}/deploy +%dir %{gopath}/src/%{import_path}/info +%dir %{gopath}/src/%{import_path}/manager +%dir %{gopath}/src/%{import_path}/pages +%dir %{gopath}/src/%{import_path}/sampling +%dir %{gopath}/src/%{import_path}/storage +%dir %{gopath}/src/%{import_path}/utils +%{gopath}/src/%{import_path}/* +%{gopath}/src/%{import_path}/api/* +%{gopath}/src/%{import_path}/client/* +%{gopath}/src/%{import_path}/container/* +%{gopath}/src/%{import_path}/deploy/* +%{gopath}/src/%{import_path}/info/* +%{gopath}/src/%{import_path}/manager/* +%{gopath}/src/%{import_path}/pages/* +%{gopath}/src/%{import_path}/sampling/* +%{gopath}/src/%{import_path}/storage/* +%{gopath}/src/%{import_path}/utils/* + +%changelog +* Thu Oct 09 2014 jchaloup <jchaloup(a)redhat.com> - 0.3.0-0.4.git9d158c3 +- Move cadvisor.service and cadvisor config file from patch into repo +- Fix the build, thanks to Lokesh + +* Fri Sep 19 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0.3.0-0.3.git9d158c3 +- own parent directory of <gopath</src/<import_path> +- preserve timestamps of copied files in -devel +- use _unitdir macro for systemd install path + +* Fri Sep 12 2014 Eric Paris <eparis(a)redhat.com - 0.3.0-0.2.git9d158c3 +- Log to stderr (and thus journal) by default + +* Thu Sep 11 2014 Eric Paris <eparis(a)redhat.com - 0.3.0-0.1.git9d158c3 +- Bump to upstream 9d158c3d66e8e6d14cfeb1d73695ab18dbc744e8 + +* Wed Aug 20 2014 Eric Paris <eparis(a)redhat.com - 0.2.0-2 +- Bump to upstream 17b0ec576bcbeb321c133e4378dee1e500c9850d + +* Thu Aug 07 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.2.0-1 +- First package for Fedora

1 0

[docker-io/f20] Resolves: rhbz#1149882
by Lokesh Mandvekar 09 Oct '14

09 Oct '14

commit 2074f27f193a999f97dc627ef694251f3fbd5920 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Thu Oct 9 11:43:42 2014 -0500 Resolves: rhbz#1149882 NVR: docker-io-1.2.0-5 Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org> modified: docker-io.spec modified: docker.service new file: docker.socket docker-io.spec | 8 ++++++-- docker.service | 2 +- docker.socket | 12 ++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index e9b9e3c..c2677c8 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -15,7 +15,7 @@ Name: %{repo}-io Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.docker.com @@ -25,6 +25,7 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz Source1: %{repo}.service Source2: %{repo}.sysconfig Source3: %{repo}-storage.sysconfig +Source4: %{repo}.socket Patch0: ignore-selinux-if-disabled.patch # though final name for sysconf/sysvinit files is simply 'docker', # having .sysvinit and .sysconfig makes things clear @@ -231,7 +232,7 @@ install -d %{buildroot}%{_sharedstatedir}/%{repo} # install systemd/init scripts install -d %{buildroot}%{_unitdir} install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir} -install -p -m 644 contrib/init/systemd/docker.socket %{buildroot}%{_unitdir} +install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir} # for additional args install -d %{buildroot}%{_sysconfdir}/sysconfig/ @@ -465,6 +466,9 @@ exit 0 %{gopath}/src/%{import_path}/pkg/version/*.go %changelog +* Wed Oct 08 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.2.0-5 +- Resolves: rhbz#1149882 - systemd unit and socket file updates + * Tue Sep 30 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.2.0-4 - Resolves: rhbz#1139415 - correct path for bash completion /usr/share/bash-completion/completions diff --git a/docker.service b/docker.service index 100e824..10c7e15 100644 --- a/docker.service +++ b/docker.service @@ -13,4 +13,4 @@ LimitNOFILE=1048576 LimitNPROC=1048576 [Install] -Also=docker.socket +WantedBy=multi-user.target diff --git a/docker.socket b/docker.socket new file mode 100644 index 0000000..7dd9509 --- /dev/null +++ b/docker.socket @@ -0,0 +1,12 @@ +[Unit] +Description=Docker Socket for the API +PartOf=docker.service + +[Socket] +ListenStream=/var/run/docker.sock +SocketMode=0660 +SocketUser=root +SocketGroup=docker + +[Install] +WantedBy=sockets.target

1 0

[docker-io/f21] Resolves: rhbz#1149882
by Lokesh Mandvekar 09 Oct '14

09 Oct '14

commit b63eba42a29b39b9900cde069c3b8314f8e16636 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Thu Oct 9 11:43:42 2014 -0500 Resolves: rhbz#1149882 NVR: docker-io-1.2.0-5 Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org> modified: docker-io.spec modified: docker.service new file: docker.socket docker-io.spec | 8 ++++++-- docker.service | 2 +- docker.socket | 12 ++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index e9b9e3c..c2677c8 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -15,7 +15,7 @@ Name: %{repo}-io Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.docker.com @@ -25,6 +25,7 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz Source1: %{repo}.service Source2: %{repo}.sysconfig Source3: %{repo}-storage.sysconfig +Source4: %{repo}.socket Patch0: ignore-selinux-if-disabled.patch # though final name for sysconf/sysvinit files is simply 'docker', # having .sysvinit and .sysconfig makes things clear @@ -231,7 +232,7 @@ install -d %{buildroot}%{_sharedstatedir}/%{repo} # install systemd/init scripts install -d %{buildroot}%{_unitdir} install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir} -install -p -m 644 contrib/init/systemd/docker.socket %{buildroot}%{_unitdir} +install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir} # for additional args install -d %{buildroot}%{_sysconfdir}/sysconfig/ @@ -465,6 +466,9 @@ exit 0 %{gopath}/src/%{import_path}/pkg/version/*.go %changelog +* Wed Oct 08 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.2.0-5 +- Resolves: rhbz#1149882 - systemd unit and socket file updates + * Tue Sep 30 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.2.0-4 - Resolves: rhbz#1139415 - correct path for bash completion /usr/share/bash-completion/completions diff --git a/docker.service b/docker.service index 100e824..10c7e15 100644 --- a/docker.service +++ b/docker.service @@ -13,4 +13,4 @@ LimitNOFILE=1048576 LimitNPROC=1048576 [Install] -Also=docker.socket +WantedBy=multi-user.target diff --git a/docker.socket b/docker.socket new file mode 100644 index 0000000..7dd9509 --- /dev/null +++ b/docker.socket @@ -0,0 +1,12 @@ +[Unit] +Description=Docker Socket for the API +PartOf=docker.service + +[Socket] +ListenStream=/var/run/docker.sock +SocketMode=0660 +SocketUser=root +SocketGroup=docker + +[Install] +WantedBy=sockets.target

1 0

[cadvisor] Move cadvisor.service and cadvisor config file from patch into repo Fix the build, thanks to Lokesh
by Jan Chaloupka 09 Oct '14

09 Oct '14

commit 82afe79b89cede59bd78e89f57ce9b22ea2bd3c8 Author: Jan Chaloupka <jchaloup(a)redhat.com> Date: Thu Oct 9 16:55:56 2014 +0200 Move cadvisor.service and cadvisor config file from patch into repo Fix the build, thanks to Lokesh cadvisor | 46 ++++++++++++++++++++++++++++++++++++++++++++++ cadvisor.service | 18 ++++++++++++++++++ cadvisor.spec | 31 ++++++++++++------------------- 3 files changed, 76 insertions(+), 19 deletions(-) --- diff --git a/cadvisor b/cadvisor new file mode 100644 index 0000000..8a2c793 --- /dev/null +++ b/cadvisor @@ -0,0 +1,46 @@ +# config options for cAdvisor +# +# + +# Docker endpoint to connect to +# Default: unix:///var/run/docker.sock +CADVISOR_DOCKER_ENDPOINT="unix:///var/run/docker.sock" + +# Port to listen on +# Default: 8080 +# kubernetes expects it on port 4194 +CADVISOR_PORT="4194" + +# Samples +# Number of samples to keep +# Default: 1024 +CADVISOR_SAMPLES="1024" + +# Storage driver +# Default: none/blank +# +# Available Options: +# - [none] +# - bigquery +# - influxdb +CADVISOR_STORAGE_DRIVER="" + +# Storage driver host +# Default: localhost:8086" +CADVISOR_STORAGE_DRIVER_HOST="localhost:8086" + +# Storage driver password +# Default: root +CADVISOR_STORAGE_DRIVER_PASSWORD="root" + +# Storage driver secure connection +# Default: false +CADVISOR_STORAGE_DRIVER_SECURE="false" + +# Storage driver user +# Default: root +CADVISOR_STORAGE_DRIVER_USER="root" + +# Log to stderr (and thus to journal) +# Default: false +CADVISOR_LOG_TO_STDERR="true" diff --git a/cadvisor.service b/cadvisor.service new file mode 100644 index 0000000..c465783 --- /dev/null +++ b/cadvisor.service @@ -0,0 +1,18 @@ +[Unit] +Description=cAdvisor + +[Service] +EnvironmentFile=/etc/sysconfig/cadvisor +ExecStart=/usr/bin/cadvisor \ + --docker=${CADVISOR_DOCKER_ENDPOINT} \ + --port=${CADVISOR_PORT} \ + --samples=${CADVISOR_SAMPLES} \ + --storage_driver=${CADVISOR_STORAGE_DRIVER} \ + --storage_driver_host=${CADVISOR_STORAGE_DRIVER_HOST} \ + --storage_driver_password=${CADVISOR_STORAGE_DRIVER_PASSWORD} \ + --storage_driver_secure=${CADVISOR_STORAGE_DRIVER_SECURE} \ + --storage_driver_user=${CADVISOR_STORAGE_DRIVER_USER} \ + --logtostderr=${CADVISOR_LOG_TO_STDERR} + +[Install] +WantedBy=multi-user.target diff --git a/cadvisor.spec b/cadvisor.spec index 211f056..52ea30e 100644 --- a/cadvisor.spec +++ b/cadvisor.spec @@ -11,14 +11,16 @@ Name: %{repo} Version: 0.3.0 -Release: 0.3.git%{shortcommit}%{?dist} +Release: 0.4.git%{shortcommit}%{?dist} Summary: Analyzes resource usage and performance characteristics of running containers License: ASL 2.0 URL: https://%{import_path} Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -Patch0: 0001-add-systemd-unit-file-sysconfig.patch +Source1: cadvisor +Source2: cadvisor.service BuildRequires: docker-io-pkg-devel BuildRequires: systemd +BuildRequires: glibc-static BuildRequires: golang >= 1.2.1-3 BuildRequires: golang(github.com/docker/libcontainer) BuildRequires: golang(github.com/fsouza/go-dockerclient) @@ -30,6 +32,7 @@ BuildRequires: golang(github.com/influxdb/influxdb/client) BuildRequires: golang(github.com/stretchr/testify) BuildRequires: golang(github.com/stretchr/objx) BuildRequires: golang(github.com/golang/glog) +Requires: docker-io ExclusiveArch: x86_64 %description @@ -102,8 +105,6 @@ so containers are inherently nested hierarchically. %prep %setup -n %{name}-%{commit} -q -%patch0 -p1 - %build mkdir _build @@ -113,19 +114,7 @@ pushd _build popd export GOPATH=$(pwd)/_build:%{buildroot}%{gopath}:%{gopath} -### FIXME -### Upstream uses this invocation of go build but it fails with the following: -# go build --ldflags '-extldflags "-static"' github.com/google/cadvisor -# # github.com/google/cadvisor -# /usr/bin/ld: cannot find -lpthread -# /usr/bin/ld: cannot find -lc -# collect2: error: ld returned 1 exit status -# /usr/lib/golang/pkg/tool/linux_amd64/6l: running gcc failed: unsuccessful exit status 0x100 -# -# It *seems* fine without it, but I assume upstream has a reason for doing -# this, however I've yet to get a response on why and if it's necessary. - -go build github.com/google/cadvisor +go build --ldflags '-extldflags "-static"' github.com/google/cadvisor %install # main package binary @@ -134,9 +123,9 @@ install -p -m0755 cadvisor %{buildroot}%{_bindir} # install systemd/sysconfig install -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig/ -install -p -m0660 sysconfig/%{name} %{buildroot}%{_sysconfdir}/sysconfig/%{name} +install -p -m0660 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name} install -d -m0755 %{buildroot}%{_unitdir} -install -p -m0644 init/%{name}.service %{buildroot}%{_unitdir}/%{name}.service +install -p -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service # devel package golang libs install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -190,6 +179,10 @@ done %{gopath}/src/%{import_path}/utils/* %changelog +* Thu Oct 09 2014 jchaloup <jchaloup(a)redhat.com> - 0.3.0-0.4.git9d158c3 +- Move cadvisor.service and cadvisor config file from patch into repo +- Fix the build, thanks to Lokesh + * Fri Sep 19 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0.3.0-0.3.git9d158c3 - own parent directory of <gopath</src/<import_path> - preserve timestamps of copied files in -devel

1 0

[golang-github-stretchr-testify/el6] Initial commit
by Jan Chaloupka 09 Oct '14

09 Oct '14

commit 3fc07a616376362d7b47b24f8813ff1cbbb4aa1e Author: Jan Chaloupka <jchaloup(a)redhat.com> Date: Wed Sep 24 12:49:46 2014 +0200 Initial commit .gitignore | 1 + golang-github-stretchr-testify.spec | 83 +++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 85 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..7de03ff 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/testify-da775f0.tar.gz diff --git a/golang-github-stretchr-testify.spec b/golang-github-stretchr-testify.spec new file mode 100644 index 0000000..4dd1c4e --- /dev/null +++ b/golang-github-stretchr-testify.spec @@ -0,0 +1,83 @@ +%global debug_package %{nil} +%global import_path github.com/stretchr/testify +%global commit da775f0337260efbac0fce9764cee5bd3e8c85b8 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: golang-github-stretchr-testify +Version: 0 +Release: 0.3.git%{shortcommit}%{?dist} +Summary: Tools for testifying that your code will behave as you intend +License: MIT +URL: http://godoc.org/%{import_path} +Source0: https://%{import_path}/archive/%{commit}/testify-%{shortcommit}.tar.gz +BuildArch: noarch + +%description +Thou Shalt Write Tests + +Go code (golang) set of packages that provide many tools for testifying that +your code will behave as you intend. + +%package devel +BuildRequires: golang >= 1.2.1-3 +Requires: golang >= 1.2.1-3 +Requires: golang(github.com/stretchr/objx) +Summary: Tools for testifying that your code will behave as you intend +Provides: golang(%{import_path}) = %{version}-%{release} +Provides: golang(%{import_path}/assert) = %{version}-%{release} +Provides: golang(%{import_path}/http) = %{version}-%{release} +Provides: golang(%{import_path}/mock) = %{version}-%{release} +Provides: golang(%{import_path}/require) = %{version}-%{release} +Provides: golang(%{import_path}/suite) = %{version}-%{release} + +%description devel +Thou Shalt Write Tests + +Go code (golang) set of packages that provide many tools for testifying that +your code will behave as you intend. + +%prep +%setup -q -n testify-%{commit} + +mv LICENCE.txt LICENSE.txt + +%build + +%install +install -d %{buildroot}/%{gopath}/src/%{import_path} +cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path} + +for d in assert http mock require suite +do + cp -pav $d %{buildroot}/%{gopath}/src/%{import_path}/ +done + +%check +# as long as there is circular dependency between +# golang-github-stretchr-testify and golang-github-stretchr-objx +# there can not by test + +%files devel +%doc LICENSE.txt README.md +%dir %{gopath}/src/%{import_path} +%dir %{gopath}/src/%{import_path}/assert +%dir %{gopath}/src/%{import_path}/http +%dir %{gopath}/src/%{import_path}/mock +%dir %{gopath}/src/%{import_path}/require +%dir %{gopath}/src/%{import_path}/suite +%{gopath}/src/%{import_path}/*.go +%{gopath}/src/%{import_path}/assert/*.go +%{gopath}/src/%{import_path}/http/*.go +%{gopath}/src/%{import_path}/mock/*.go +%{gopath}/src/%{import_path}/require/*.go +%{gopath}/src/%{import_path}/suite/*.go + +%changelog +* Mon Sep 15 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.3.gitda775f0 +- preserve timestamps of copied files + +* Wed Aug 06 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0-0.2.gitda775f0 +- Fix up devel package listing + +* Wed Aug 06 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0-0.1.gitda775f0 +- First package for Fedora. diff --git a/sources b/sources index e69de29..564eb53 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +caf0ae83603dc52e382e143df98e7bfc testify-da775f0.tar.gz

1 0

[golang-github-stretchr-objx/el6] Initial commit
by Jan Chaloupka 09 Oct '14

09 Oct '14

commit b47326a0c6d70842e9be2d714b556a30d6f7bd1d Author: Jan Chaloupka <jchaloup(a)redhat.com> Date: Wed Sep 24 12:48:26 2014 +0200 Initial commit .gitignore | 1 + golang-github-stretchr-objx.spec | 61 ++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 63 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..95f92d7 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/objx-cbeaeb1.tar.gz diff --git a/golang-github-stretchr-objx.spec b/golang-github-stretchr-objx.spec new file mode 100644 index 0000000..40350fb --- /dev/null +++ b/golang-github-stretchr-objx.spec @@ -0,0 +1,61 @@ +%global debug_package %{nil} +%global import_path github.com/stretchr/objx +%global commit cbeaeb16a013161a98496fad62933b1d21786672 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: golang-github-stretchr-objx +Version: 0 +Release: 0.2.git%{shortcommit}%{?dist} +Summary: Go package for dealing with maps, slices, JSON and other data +License: MIT +URL: http://godoc.org/%{import_path} +Source0: https://%{import_path}/archive/%{commit}/objx-%{shortcommit}.tar.gz +BuildArch: noarch + +%description +Objx provides the `objx.Map` type, which is a `map[string]interface{}` that +exposes a powerful `Get` method (among others) that allows you to easily and +quickly get access to data within the map, without having to worry too much +about type assertions, missing data, default values etc. + +%package devel +BuildRequires: golang >= 1.2.1-3 +Requires: golang >= 1.2.1-3 +Requires: golang(github.com/stretchr/testify) +Summary: Go package for dealing with maps, slices, JSON and other data +Provides: golang(%{import_path}) = %{version}-%{release} + +%description devel +Objx provides the `objx.Map` type, which is a `map[string]interface{}` that +exposes a powerful `Get` method (among others) that allows you to easily and +quickly get access to data within the map, without having to worry too much +about type assertions, missing data, default values etc. + +%prep +%setup -q -n objx-%{commit} + +%build + +%install +install -d %{buildroot}/%{gopath}/src/%{import_path} +cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/ +cp -pav codegen %{buildroot}/%{gopath}/src/%{import_path}/ + +%check +# as long as there is circular dependency between +# golang-github-stretchr-testify and golang-github-stretchr-objx +# there can not by test + +%files devel +%doc LICENSE.md README.md +%dir %{gopath}/src/%{import_path} +%dir %{gopath}/src/%{import_path}/codegen +%{gopath}/src/%{import_path}/* +%{gopath}/src/%{import_path}/codegen/* + +%changelog +* Mon Sep 15 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0-0.2.gitcbeaeb1 +- do not redefine gopath + +* Wed Aug 06 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0-0.1.gitcbeaeb1 +- First package for Fedora. diff --git a/sources b/sources index e69de29..ef5eb17 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +f85e2560806c565e2c2a62bdf5f16a20 objx-cbeaeb1.tar.gz

1 0

[golang-github-golang-glog/el6] Initial commit
by Jan Chaloupka 09 Oct '14

09 Oct '14

commit 1e90e28357ef0485e8ca1ae1bc39f2cd4d3265fe Author: Jan Chaloupka <jchaloup(a)redhat.com> Date: Tue Sep 23 17:09:04 2014 +0200 Initial commit .gitignore | 1 + golang-github-golang-glog.spec | 58 ++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 60 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..4527db5 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/glog-d1c4472bf2efd3826f2b5bdcc02d8416798d678c.tar.gz diff --git a/golang-github-golang-glog.spec b/golang-github-golang-glog.spec new file mode 100644 index 0000000..9e88f2e --- /dev/null +++ b/golang-github-golang-glog.spec @@ -0,0 +1,58 @@ +%global commit d1c4472bf2efd3826f2b5bdcc02d8416798d678c +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global import_path github.com/golang/glog + +Name: golang-github-golang-glog +Version: 0 +Release: 0.2.git%{shortcommit}%{?dist} +Summary: Leveled execution logs for Go +License: ASL 2.0 +URL: http://%{import_path} +Source0: https://%{import_path}/archive/%{commit}/glog-%{commit}.tar.gz +BuildArch: noarch + +%description +%{summary} + +%package devel +BuildRequires: golang >= 1.2.1-3 +Requires: golang >= 1.2.1-3 +Summary: Enables Go programs to comfortably encode and decode YAML values +Provides: golang(%{import_path}) = %{version}-%{release} + +%description devel +%{summary} + +This is an efficient pure Go implementation of leveled logs in the +manner of the open source C++ package + http://code.google.com/p/google-glog + +By binding methods to booleans it is possible to use the log package +without paying the expense of evaluating the arguments to the log. +Through the -vmodule flag, the package also provides fine-grained +control over logging at the file level. + +%prep +%setup -n glog-%{commit} -q + +%build + +%install +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/ + +%check +GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path} + +%files devel +%doc LICENSE README +%dir %{gopath}/src/%{import_path} +%{gopath}/src/%{import_path}/*.go + +%changelog +* Mon Sep 15 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 0.2.gitd1c4472 +- BR golang +- include check + +* Tue Aug 05 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.0.1.gitd1c4472b +- First package for Fedora diff --git a/sources b/sources index e69de29..ef3905f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b4e18f169cd384df0a4c23d77bb8ff15 glog-d1c4472bf2efd3826f2b5bdcc02d8416798d678c.tar.gz

1 0

[docker-io] Resolves: rhbz#1149882
by Lokesh Mandvekar 09 Oct '14

09 Oct '14

commit 6d2a6815806374bbb16e5559d8245af581a29fb8 Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org> Date: Thu Oct 9 11:43:42 2014 -0500 Resolves: rhbz#1149882 NVR: docker-io-1.2.0-5 Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org> modified: docker-io.spec modified: docker.service new file: docker.socket docker-io.spec | 8 ++++++-- docker.service | 2 +- docker.socket | 12 ++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index e9b9e3c..c2677c8 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -15,7 +15,7 @@ Name: %{repo}-io Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.docker.com @@ -25,6 +25,7 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz Source1: %{repo}.service Source2: %{repo}.sysconfig Source3: %{repo}-storage.sysconfig +Source4: %{repo}.socket Patch0: ignore-selinux-if-disabled.patch # though final name for sysconf/sysvinit files is simply 'docker', # having .sysvinit and .sysconfig makes things clear @@ -231,7 +232,7 @@ install -d %{buildroot}%{_sharedstatedir}/%{repo} # install systemd/init scripts install -d %{buildroot}%{_unitdir} install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir} -install -p -m 644 contrib/init/systemd/docker.socket %{buildroot}%{_unitdir} +install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir} # for additional args install -d %{buildroot}%{_sysconfdir}/sysconfig/ @@ -465,6 +466,9 @@ exit 0 %{gopath}/src/%{import_path}/pkg/version/*.go %changelog +* Wed Oct 08 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.2.0-5 +- Resolves: rhbz#1149882 - systemd unit and socket file updates + * Tue Sep 30 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.2.0-4 - Resolves: rhbz#1139415 - correct path for bash completion /usr/share/bash-completion/completions diff --git a/docker.service b/docker.service index 100e824..10c7e15 100644 --- a/docker.service +++ b/docker.service @@ -13,4 +13,4 @@ LimitNOFILE=1048576 LimitNPROC=1048576 [Install] -Also=docker.socket +WantedBy=multi-user.target diff --git a/docker.socket b/docker.socket new file mode 100644 index 0000000..7dd9509 --- /dev/null +++ b/docker.socket @@ -0,0 +1,12 @@ +[Unit] +Description=Docker Socket for the API +PartOf=docker.service + +[Socket] +ListenStream=/var/run/docker.sock +SocketMode=0660 +SocketUser=root +SocketGroup=docker + +[Install] +WantedBy=sockets.target

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

golang October 2014