diff --git a/SOURCES/docker.sysconfig b/SOURCES/docker.sysconfig index efa5af1..0b63c43 100644 --- a/SOURCES/docker.sysconfig +++ b/SOURCES/docker.sysconfig @@ -1,4 +1,4 @@ # /etc/sysconfig/docker # Modify these options if you want to change the way the docker daemon runs -OPTIONS=--selinux-enabled -H fd:// +OPTIONS=--selinux-enabled diff --git a/SPECS/docker.spec b/SPECS/docker.spec index b00dbd3..f8870c3 100644 --- a/SPECS/docker.spec +++ b/SPECS/docker.spec @@ -36,12 +36,12 @@ BuildRequires: glibc-static # http://code.google.com/p/go/source/detail?r=a15f344a9efa35ef168c8feaa92a15a1cdc93db5 BuildRequires: golang >= 1.3.1 BuildRequires: golang(github.com/gorilla/mux) >= 0-0.12 -BuildRequires: golang(github.com/kr/pty) >= 0-0.20 +BuildRequires: golang(github.com/kr/pty) >= 0-0.19 BuildRequires: golang(code.google.com/p/go.net/websocket) BuildRequires: golang(code.google.com/p/gosqlite/sqlite3) -BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.6 +BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.5 BuildRequires: golang(github.com/godbus/dbus) -BuildRequires: golang(github.com/coreos/go-systemd/activation) >= 2-2 +BuildRequires: golang(github.com/coreos/go-systemd/activation) >= 2-1 #BuildRequires: golang(github.com/codegangsta/cli) BuildRequires: device-mapper-devel BuildRequires: btrfs-progs-devel @@ -213,14 +213,14 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage # install secrets dir -install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets +#install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets # rhbz#1110876 - update symlinks for subscription management -ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement -ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm -ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo +#ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement +#ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm +#ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo -mkdir -p %{buildroot}/etc/docker/certs.d/redhat.com -ln -s /etc/rhsm/ca/redhat-uep.pem %{buildroot}/etc/docker/certs.d/redhat.com/redhat-ca.crt +mkdir -p %{buildroot}/etc/docker/certs.d/ +#ln -s /etc/rhsm/ca/redhat-uep.pem %{buildroot}/etc/docker/certs.d/redhat.com/redhat-ca.crt # Install nsinit install -d -p %{buildroot}%{gopath}/src/github.com/docker/libcontainer/nsinit @@ -269,11 +269,11 @@ exit 0 %{_mandir}/man1/* %{_mandir}/man5/* %{_bindir}/docker -%dir %{_datadir}/rhel -%dir %{_datadir}/rhel/secrets -%{_datadir}/rhel/secrets/etc-pki-entitlement -%{_datadir}/rhel/secrets/rhel7.repo -%{_datadir}/rhel/secrets/rhsm +#%dir %{_datadir}/rhel +#%dir %{_datadir}/rhel/secrets +#%{_datadir}/rhel/secrets/etc-pki-entitlement +#%{_datadir}/rhel/secrets/rhel7.repo +#%{_datadir}/rhel/secrets/rhsm %dir %{_libexecdir}/docker %{_libexecdir}/docker/dockerinit %{_unitdir}/docker.service @@ -532,6 +532,11 @@ exit 0 %{gopath}/src/%{import_path}/pkg/version/*.go %changelog +* Thu Nov 06 2014 Jim Perrin - 1.2.0-1.8 +- Adjust build requirements +- Remove -H option from docker.sysconfig +- Comment out symlinks and other rhel-specific items in spec + * Thu Oct 30 2014 Dan Walsh - 1.2.0-1.8 - Remove docker-rhel entitlment patch. This was buggy and is no longer needed