Automates deployment of containerized applications
4 files modified
1 files added
135 ■■■■■ changed files
.docker.metadata 6 ●●●● patch | view | raw | blame | history
.gitignore 6 ●●●● patch | view | raw | blame | history
README.debrand 2 ●●●●● patch | view | raw | blame | history
SOURCES/docker.service 2 ●●●●● patch | view | raw | blame | history
SPECS/docker.spec 119 ●●●●● patch | view | raw | blame | history
.docker.metadata
@@ -1,9 +1,9 @@
c6923103ffa2030844dc0292dd5975443e12eb5c SOURCES/87f2fab3d32f145760b94b87b93daa83e6841ee7.tar.gz
5f2ee34452a1cdf1a47cbb288779db277384360f SOURCES/94f42401bf8b413eac9dbb0e4065fa5bcb640696.tar.gz
9e9e55d86e9df69ce17c8186d6ead913273f02cf SOURCES/container-storage-setup-e0997c3.tar.gz
402d105d5ed40a9820d41b3f677df07c566393c9 SOURCES/containerd-296f1f8.tar.gz
b0ba595ce2314c59ebbd53400f7f64809331a6b9 SOURCES/docker-lvm-plugin-8647404.tar.gz
59ad98a21ceca5617c1b8f8fdd6feb421ab16367 SOURCES/docker-lvm-plugin-04caa55.tar.gz
0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz
f2f7c536bb870f5edc41a86d70c84439f5f638e3 SOURCES/libnetwork-2bf6330.tar.gz
b2e15cf176c0f24816d49903c19a9561c869aa12 SOURCES/libnetwork-5c1218c.tar.gz
965d64f5a81c3a428ca3b29495ecf66748c67c1f SOURCES/rhel-push-plugin-af9107b.tar.gz
78795d104677625593c70e1dbe569f235b5af0c5 SOURCES/runc-e9c345b.tar.gz
c5c3577b90edc8902f3dd888e55334ba6e9e1ddf SOURCES/tini-5b117de.tar.gz
.gitignore
@@ -1,9 +1,9 @@
SOURCES/87f2fab3d32f145760b94b87b93daa83e6841ee7.tar.gz
SOURCES/94f42401bf8b413eac9dbb0e4065fa5bcb640696.tar.gz
SOURCES/container-storage-setup-e0997c3.tar.gz
SOURCES/containerd-296f1f8.tar.gz
SOURCES/docker-lvm-plugin-8647404.tar.gz
SOURCES/docker-lvm-plugin-04caa55.tar.gz
SOURCES/docker-novolume-plugin-385ec70.tar.gz
SOURCES/libnetwork-2bf6330.tar.gz
SOURCES/libnetwork-5c1218c.tar.gz
SOURCES/rhel-push-plugin-af9107b.tar.gz
SOURCES/runc-e9c345b.tar.gz
SOURCES/tini-5b117de.tar.gz
README.debrand
New file
@@ -0,0 +1,2 @@
Warning: This package was configured for automatic debranding, but the changes
failed to apply.
SOURCES/docker.service
@@ -3,6 +3,7 @@
Documentation=http://docs.docker.com
After=network.target rhel-push-plugin.socket registries.service
Wants=docker-storage-setup.service
Requires=rhel-push-plugin.socket registries.service
Requires=docker-cleanup.timer
[Service]
@@ -18,6 +19,7 @@
ExecStart=/usr/bin/dockerd-current \
          --add-runtime docker-runc=/usr/libexec/docker/docker-runc-current \
          --default-runtime=docker-runc \
          --authorization-plugin=rhel-push-plugin \
          --exec-opt native.cgroupdriver=systemd \
          --userland-proxy-path=/usr/libexec/docker/docker-proxy-current \
          --init-path=/usr/libexec/docker/docker-init-current \
SPECS/docker.spec
@@ -24,7 +24,7 @@
# docker
%global git_docker https://github.com/projectatomic/docker
%global commit_docker 87f2fab3d32f145760b94b87b93daa83e6841ee7
%global commit_docker 94f42401bf8b413eac9dbb0e4065fa5bcb640696
%global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7})
# docker_branch used in %%check
%global docker_branch %{name}-%{version}
@@ -46,13 +46,13 @@
%global shortcommit_novolume %(c=%{commit_novolume}; echo ${c:0:7})
# rhel-push-plugin
#%global git_rhel_push https://github.com/projectatomic/rhel-push-plugin
#%global commit_rhel_push af9107b2aedb235338e32a3c19507cad3f218b0d
#%global shortcommit_rhel_push %(c=%{commit_rhel_push}; echo ${c:0:7})
%global git_rhel_push https://github.com/projectatomic/rhel-push-plugin
%global commit_rhel_push af9107b2aedb235338e32a3c19507cad3f218b0d
%global shortcommit_rhel_push %(c=%{commit_rhel_push}; echo ${c:0:7})
# docker-lvm-plugin
%global git_lvm https://github.com/projectatomic/%{repo}-lvm-plugin
%global commit_lvm 8647404eed561d32835d6bc032b1c330ee31ed5b
%global commit_lvm 04caa55d50d614d11d542b187d8faa33f13b116e
%global shortcommit_lvm %(c=%{commit_lvm}; echo ${c:0:7})
# docker-runc
@@ -72,20 +72,20 @@
# docker-proxy
%global git_libnetwork https://github.com/docker/libnetwork
%global commit_libnetwork 2bf63300c52f5ea61989f85c732f00097d746530
%global commit_libnetwork 5c1218c956c99f3365711974e300087810c31379
%global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7})
Name: %{repo}
Epoch: 2
Version: 1.13.1
Release: 58.git%{shortcommit_docker}%{?dist}
Release: 63.git%{shortcommit_docker}%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: https://%{import_path}
Source0: %{git_docker}/archive/%{commit_docker}.tar.gz
Source2: %{git_dss}/archive/%{commit_dss}/container-storage-setup-%{shortcommit_dss}.tar.gz
Source4: %{git_novolume}/archive/%{commit_novolume}/%{repo}-novolume-plugin-%{shortcommit_novolume}.tar.gz
#Source5: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortcommit_rhel_push}.tar.gz
Source5: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortcommit_rhel_push}.tar.gz
Source6: %{git_lvm}/archive/%{commit_lvm}/%{repo}-lvm-plugin-%{shortcommit_lvm}.tar.gz
Source8: %{name}.service
Source9: %{name}.sysconfig
@@ -179,10 +179,9 @@
Requires: oci-umount >= 2:2.3.3-3
Requires: oci-register-machine >= 1:0-5.13
Requires: oci-systemd-hook >= 1:0.1.4-9
#Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
#Requires: subscription-manager-plugin-container
Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
Requires: xz
#Requires: atomic-registries
Requires: atomic-registries
Requires: container-selinux >= 2:2.51-1
Requires: container-storage-setup >= 0.9.0-1
# rhbz#1214070 - update deps for d-s-s
@@ -232,16 +231,16 @@
The only thing allowed will be just bind mounts.
#%package rhel-push-plugin
#License: GPLv2
#Summary: Avoids pushing a RHEL-based image to docker.io registry
%package rhel-push-plugin
License: GPLv2
Summary: Avoids pushing a RHEL-based image to docker.io registry
#%description rhel-push-plugin
#In order to use this plugin you must be running at least Docker 1.10 which
#has support for authorization plugins.
%description rhel-push-plugin
In order to use this plugin you must be running at least Docker 1.10 which
has support for authorization plugins.
#This plugin avoids any RHEL based image to be pushed to the default docker.io
#registry preventing users to violate the RH subscription agreement.
This plugin avoids any RHEL based image to be pushed to the default docker.io
registry preventing users to violate the RH subscription agreement.
%package lvm-plugin
License: LGPLv3
@@ -264,7 +263,7 @@
tar zxf %{SOURCE4}
# untar rhel-push-plugin
#tar zxf %{SOURCE5}
tar zxf %{SOURCE5}
# untar lvm-plugin
tar zxf %{SOURCE6}
@@ -325,7 +324,7 @@
  mkdir -p src/%{provider}.%{provider_tld}/{%{name},projectatomic}
  ln -s $(dirs +1 -l) src/%{import_path}
  ln -s $(dirs +1 -l)/%{repo}-novolume-plugin-%{commit_novolume} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin
#  ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
  ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
  ln -s $(dirs +1 -l)/%{repo}-lvm-plugin-%{commit_lvm} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-lvm-plugin
popd
@@ -334,10 +333,10 @@
%gobuild %{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin
popd
#export GOPATH=$(pwd)/rhel-push-plugin-%{commit_rhel_push}/Godeps/_workspace:$(pwd)/_build
#pushd $(pwd)/_build/src
#%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
#popd
export GOPATH=$(pwd)/rhel-push-plugin-%{commit_rhel_push}/Godeps/_workspace:$(pwd)/_build
pushd $(pwd)/_build/src
%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
popd
export GOPATH=$(pwd)/%{repo}-lvm-plugin-%{commit_lvm}/vendor:$(pwd)/_build
pushd $(pwd)/_build/src
@@ -351,7 +350,7 @@
# build %%{name} manpages
man/md2man-all.sh
go-md2man -in %{repo}-novolume-plugin-%{commit_novolume}/man/%{repo}-novolume-plugin.8.md -out %{repo}-novolume-plugin.8
#go-md2man -in rhel-push-plugin-%{commit_rhel_push}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8
go-md2man -in rhel-push-plugin-%{commit_rhel_push}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8
go-md2man -in %{repo}-lvm-plugin-%{commit_lvm}/man/%{repo}-lvm-plugin.8.md -out %{repo}-lvm-plugin.8
# build %%{name} binary
@@ -508,12 +507,12 @@
install -p -m 644 %{repo}-novolume-plugin.8 %{buildroot}%{_mandir}/man8
# install rhel-push-plugin executable, unitfile, socket and man
#install -d %{buildroot}%{_libexecdir}/%{repo}
#install -p -m 755 _build/src/rhel-push-plugin %{buildroot}%{_libexecdir}/%{repo}/rhel-push-plugin
#install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service
#install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.socket %{buildroot}%{_unitdir}/rhel-push-plugin.socket
#install -d %{buildroot}%{_mandir}/man8
#install -p -m 644 rhel-push-plugin.8 %{buildroot}%{_mandir}/man8
install -d %{buildroot}%{_libexecdir}/%{repo}
install -p -m 755 _build/src/rhel-push-plugin %{buildroot}%{_libexecdir}/%{repo}/rhel-push-plugin
install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service
install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.socket %{buildroot}%{_unitdir}/rhel-push-plugin.socket
install -d %{buildroot}%{_mandir}/man8
install -p -m 644 rhel-push-plugin.8 %{buildroot}%{_mandir}/man8
# install %%{repo}-lvm-plugin executable, unitfile, socket and man
install -d %{buildroot}/%{_libexecdir}/%{repo}
@@ -593,14 +592,14 @@
%postun novolume-plugin
%systemd_postun_with_restart %{name}-novolume-plugin.service
#%post rhel-push-plugin
#%systemd_post rhel-push-plugin.service
%post rhel-push-plugin
%systemd_post rhel-push-plugin.service
#%preun rhel-push-plugin
#%systemd_preun rhel-push-plugin.service
%preun rhel-push-plugin
%systemd_preun rhel-push-plugin.service
#%postun rhel-push-plugin
#%systemd_postun_with_restart rhel-push-plugin.service
%postun rhel-push-plugin
%systemd_postun_with_restart rhel-push-plugin.service
%posttrans
# Install a default docker-storage-setup based on kernel version.
@@ -696,12 +695,12 @@
%{_libexecdir}/%{repo}/%{repo}-novolume-plugin
%{_unitdir}/%{repo}-novolume-plugin.*
#%files rhel-push-plugin
#%license rhel-push-plugin-%{commit_rhel_push}/LICENSE
#%doc rhel-push-plugin-%{commit_rhel_push}/README.md
#%{_mandir}/man8/rhel-push-plugin.8.gz
#%{_libexecdir}/%{repo}/rhel-push-plugin
#%{_unitdir}/rhel-push-plugin.*
%files rhel-push-plugin
%license rhel-push-plugin-%{commit_rhel_push}/LICENSE
%doc rhel-push-plugin-%{commit_rhel_push}/README.md
%{_mandir}/man8/rhel-push-plugin.8.gz
%{_libexecdir}/%{repo}/rhel-push-plugin
%{_unitdir}/rhel-push-plugin.*
%files lvm-plugin
%license %{repo}-lvm-plugin-%{commit_lvm}/LICENSE
@@ -717,8 +716,36 @@
%{_bindir}/%{name}-v1.10-migrator-*
%changelog
* Fri May 11 2018 Johnny Hughes <johnny@centos.org> - 2:1.13.1-58.git87f2fab
- Manual CentOS Debranding
* Mon Apr 30 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-63.git94f4240
- built docker @projectatomic/docker-1.13.1-rhel commit 94f4240
* Tue Apr 10 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-62.gitc6c9b51
- built docker @projectatomic/docker-1.13.1-rhel commit c6c9b51
- built docker-novolume-plugin commit 385ec70
- built rhel-push-plugin commit af9107b
- built docker-lvm-plugin commit 04caa55
- built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b
- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8
- built oci-umount commit
- built docker-init commit 5b117de
- built libnetwork commit 5c1218c
* Fri Apr 06 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-61.git87f2fab
- do not change commit id for docker at this stage
* Fri Apr 06 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-60.git2d99c6f
- remove dep on subscription-manager-plugin-container
* Mon Mar 26 2018 Daniel J Walsh <dwalsh@redhat.com> - 2:1.13.1-59.git2d99c6f
- built docker @projectatomic/docker-1.13.1-rhel commit 2d99c6f
- built docker-novolume-plugin commit 385ec70
- built rhel-push-plugin commit af9107b
- built docker-lvm-plugin commit 8647404
- built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b
- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8
- built oci-umount commit
- built docker-init commit 5b117de
- built libnetwork commit 2bf6330
* Mon Mar 19 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-58.git87f2fab
- built docker @projectatomic/docker-1.13.1-rhel commit 87f2fab