Automates deployment of containerized applications
1 files added
5 files modified
171 ■■■■■ changed files
.docker.metadata 12 ●●●● patch | view | raw | blame | history
.gitignore 2 ●●● patch | view | raw | blame | history
README.debrand 2 ●●●●● patch | view | raw | blame | history
SOURCES/docker.service 2 ●●●●● patch | view | raw | blame | history
SOURCES/docker.sysconfig 13 ●●●●● patch | view | raw | blame | history
SPECS/docker.spec 140 ●●●●● patch | view | raw | blame | history
.docker.metadata
@@ -1,8 +1,8 @@
6e71404a1f40fc934e9480bf428d8fb700d67296 SOURCES/85d7426b2840893da74de7f6ee2bbd08e1d6cf5e.tar.gz
27fe386ea4378b478fa0051976d761419aa3f070 SOURCES/container-storage-setup-8276a1e.tar.gz
e8792b09d6b92c4052831c79975917c02715c709 SOURCES/containerd-fa8fb3d.tar.gz
ab20ee7e721a8c02467b482033a499006a8c6320 SOURCES/docker-lvm-plugin-8647404.tar.gz
24382ff77b251c04672d652758cca2a33cc8c216 SOURCES/docker-novolume-plugin-385ec70.tar.gz
f97e24fe3b983854ce79547955173943c954ac23 SOURCES/rhel-push-plugin-af9107b.tar.gz
9e13309de5e468d5d68208d5fd0b7aca5e9f948e SOURCES/containerd-fa8fb3d.tar.gz
b0ba595ce2314c59ebbd53400f7f64809331a6b9 SOURCES/docker-lvm-plugin-8647404.tar.gz
0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz
a9e5fd00844dc8f08a89ffd78818dfe281315159 SOURCES/ec8512ba42f349cbe5a63140c4d9c810f7afa527.tar.gz
965d64f5a81c3a428ca3b29495ecf66748c67c1f SOURCES/rhel-push-plugin-af9107b.tar.gz
d01d661d4fb75caa219dd9ded75a7064a30d41b6 SOURCES/runc-c5d3116.tar.gz
ea4b3d96c46fccb6781d66a6c53c087b179c80fe SOURCES/v1.10-migrator-c417a6a.tar.gz
496f9927f4254508ea1cd94f473b5b9321d41245 SOURCES/v1.10-migrator-c417a6a.tar.gz
.gitignore
@@ -1,8 +1,8 @@
SOURCES/85d7426b2840893da74de7f6ee2bbd08e1d6cf5e.tar.gz
SOURCES/container-storage-setup-8276a1e.tar.gz
SOURCES/containerd-fa8fb3d.tar.gz
SOURCES/docker-lvm-plugin-8647404.tar.gz
SOURCES/docker-novolume-plugin-385ec70.tar.gz
SOURCES/ec8512ba42f349cbe5a63140c4d9c810f7afa527.tar.gz
SOURCES/rhel-push-plugin-af9107b.tar.gz
SOURCES/runc-c5d3116.tar.gz
SOURCES/v1.10-migrator-c417a6a.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
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 \
          $OPTIONS \
SOURCES/docker.sysconfig
@@ -10,6 +10,19 @@
# from the atomic-registries package.
#
# On an SELinux system, if you remove the --selinux-enabled option, you
# also need to turn on the docker_transition_unconfined boolean.
# setsebool -P docker_transition_unconfined 1
# Location used for temporary files, such as those created by
# docker load and build operations. Default is /var/lib/docker/tmp
# Can be overriden by setting the following environment variable.
# DOCKER_TMPDIR=/var/tmp
# Controls the /etc/cron.daily/docker-logrotate cron job status.
# To disable, uncomment the line below.
# LOGROTATE=false
# docker-latest daemon can be used by starting the docker-latest unitfile.
# To use docker-latest client, uncomment below lines
#DOCKERBINARY=/usr/bin/docker-latest
SPECS/docker.spec
@@ -24,7 +24,7 @@
# docker
%global git_docker https://github.com/projectatomic/docker
%global commit_docker 85d7426b2840893da74de7f6ee2bbd08e1d6cf5e
%global commit_docker ec8512ba42f349cbe5a63140c4d9c810f7afa527
%global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7})
# docker_branch used in %%check
%global docker_branch %{name}-%{version}
@@ -46,9 +46,9 @@
%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
@@ -68,14 +68,14 @@
Name: %{repo}
Epoch: 2
Version: 1.12.6
Release: 61.git%{shortcommit_docker}%{?dist}
Release: 68.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
@@ -165,10 +165,10 @@
Requires: oci-umount >= 2:2.0.0-1
Requires: oci-register-machine >= 1:0-3.10
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: subscription-manager-plugin-container
Requires: xz
#Requires: atomic-registries
Requires: atomic-registries
Requires: container-selinux >= 2:2.21-2
Requires: container-storage-setup >= 0.7.0-1
# rhbz#1214070 - update deps for d-s-s
@@ -176,7 +176,7 @@
Requires: xfsprogs
# rhbz#1282898 - obsolete docker-storage-setup
Obsoletes: %{name}-storage-setup <= 0.0.4-2
Requires: skopeo-containers
Requires: skopeo-containers >= 0.1.24-3
Requires: gnupg
Requires: tar
@@ -218,16 +218,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
@@ -250,7 +250,7 @@
tar zxf %{SOURCE4}
# untar rhel-push-plugin
#tar zxf %{SOURCE5}
tar zxf %{SOURCE5}
# untar lvm-plugin
tar zxf %{SOURCE6}
@@ -297,7 +297,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
@@ -306,10 +306,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
@@ -323,7 +323,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
@@ -439,13 +439,7 @@
rm -rf %{buildroot}%{_sharedstatedir}/%{name}-unit-test/contrib/init/openrc/%{name}.initd
%endif
# install secrets dir
#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
# install certs for redhat registries
mkdir -p %{buildroot}/etc/%{name}/certs.d/redhat.{com,io}
mkdir -p %{buildroot}/etc/%{name}/certs.d/registry.access.redhat.com
ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt
@@ -472,12 +466,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}
@@ -553,14 +547,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
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
@@ -582,8 +576,6 @@
%{_mandir}/man1/%{name}*.1.gz
%{_mandir}/man5/*.5.gz
%{_mandir}/man8/%{name}d.8.gz
#%dir %{_datadir}/rhel
#%{_datadir}/rhel/*
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}-storage-setup.service
%{_datadir}/bash-completion/completions/%{name}
@@ -637,12 +629,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
@@ -658,8 +650,48 @@
%{_bindir}/%{name}-v1.10-migrator-*
%changelog
* Tue Oct 24 2017 Johnny Hughes <johnny@centos.org> - 2:1.12.6-61.git85d7426
- Manual CentOS Debranding
* Thu Nov 16 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-68.gitec8512b
- revert some docker.sysconfig deletions wrongly done in commit 3b003db
* Thu Nov 09 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-67.gitec8512b
- built docker @projectatomic/docker-1.12.6 commit ec8512b
- built docker-novolume-plugin commit 385ec70
- built rhel-push-plugin commit af9107b
- built docker-lvm-plugin commit 8647404
- built docker-runc @projectatomic/docker-1.12.6 commit c5d3116
- built docker-containerd @projectatomic/docker-1.12.6 commit fa8fb3d
* Thu Nov 09 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-66.gitd6f7b83
- built docker @projectatomic/docker-1.12.6 commit d6f7b83
- built docker-novolume-plugin commit 385ec70
- built rhel-push-plugin commit af9107b
- built docker-lvm-plugin commit 8647404
- built docker-runc @projectatomic/docker-1.12.6 commit c5d3116
- built docker-containerd @projectatomic/docker-1.12.6 commit fa8fb3d
* Tue Nov 07 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-65.git61aa37c
- adjust sources file
* Fri Nov 03 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-64.git61aa37c
- Resolves: #1498553
- built docker @projectatomic/docker-1.12.6 commit 61aa37c
- built docker-novolume-plugin commit 385ec70
- built rhel-push-plugin commit af9107b
- built docker-lvm-plugin commit 8647404
- built docker-runc @projectatomic/docker-1.12.6 commit c5d3116
- built docker-containerd @projectatomic/docker-1.12.6 commit fa8fb3d
* Thu Nov 02 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-63.git6f58874
- built docker @projectatomic/docker-1.12.6 commit 6f58874
- built docker-novolume-plugin commit 385ec70
- built rhel-push-plugin commit af9107b
- built docker-lvm-plugin commit 8647404
- built docker-runc @projectatomic/docker-1.12.6 commit c5d3116
- built docker-containerd @projectatomic/docker-1.12.6 commit fa8fb3d
* Thu Oct 19 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-62.git85d7426
- rhel subscription secrets info moved to skopeo-containers
- require skopeo-containers >= 0.1.24-3
* Tue Sep 26 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-61.git85d7426
- reverted sources, the same file name should not have a different name