Automates deployment of containerized applications
93eb6f6dce9a392a4005ba68e9ac4dbb2afcb4ca..f5c4a8454bf5409fcb5859028ba90fb5038bd20f
2019-01-31 CentOS Sources
debrand docker-1.13.1-90.git07f3374.el7
f5c4a8 diff | tree
2019-01-31 CentOS Sources
import docker-1.13.1-90.git07f3374.el7
6242b9 diff | tree
3 files modified
31 ■■■■■ changed files
.docker.metadata 2 ●●● patch | view | raw | blame | history
.gitignore 2 ●●● patch | view | raw | blame | history
SPECS/docker.spec 27 ●●●●● patch | view | raw | blame | history
.docker.metadata
@@ -1,6 +1,6 @@
4191963addb1f68b3bebfb93dbe12cb5db7a22d1 SOURCES/07f3374cf1b29aadf824d8b8dcbf6e63403689c6.tar.gz
e21d6c1b9e04650915499946bb4e6a01727c7d54 SOURCES/container-storage-setup-413b408.tar.gz
acac6c27b31a691a1326033861c18dbdd4588a07 SOURCES/containerd-923a387.tar.gz
1d7cd417c6e8414b65bd127f488719b5355e135f SOURCES/containerd-b968034.tar.gz
c5e6169ea101c97d94257f48fa227f5ff0501454 SOURCES/docker-lvm-plugin-20a1f68.tar.gz
0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz
656b1d1605dc43d7f5c00cedadd686dbd418d285 SOURCES/libnetwork-c5d66a0.tar.gz
.gitignore
@@ -1,6 +1,6 @@
SOURCES/07f3374cf1b29aadf824d8b8dcbf6e63403689c6.tar.gz
SOURCES/container-storage-setup-413b408.tar.gz
SOURCES/containerd-923a387.tar.gz
SOURCES/containerd-b968034.tar.gz
SOURCES/docker-lvm-plugin-20a1f68.tar.gz
SOURCES/docker-novolume-plugin-385ec70.tar.gz
SOURCES/libnetwork-c5d66a0.tar.gz
SPECS/docker.spec
@@ -19,10 +19,7 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%if ! 0%{?gobuild:1}
%define gobuild(o:) \
scl enable go-toolset-1.10 -- go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
%endif
%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${GO_LDFLAGS:-} ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'" -a -v -x %{?**};
# docker
%global git_docker https://github.com/projectatomic/docker
@@ -64,7 +61,7 @@
# docker-containerd
%global git_containerd https://github.com/projectatomic/containerd
%global commit_containerd 923a38785ecb7156f00403cb1cbf5b448bd3befa
%global commit_containerd b968034319d76c623176301198c1e34ea6541b33
%global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7})
# docker-init
@@ -80,7 +77,7 @@
Name: %{repo}
Epoch: 2
Version: 1.13.1
Release: 88.git%{shortcommit_docker}%{?dist}
Release: 90.git%{shortcommit_docker}%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: https://%{import_path}
@@ -119,8 +116,6 @@
%if 0%{?fedora} || 0%{?centos}
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
%else
BuildRequires: go-toolset-7-runtime
BuildRequires: go-toolset-7-golang-bin
BuildRequires: go-toolset-1.10
BuildRequires: openssl-devel
%endif #fedora
@@ -266,7 +261,7 @@
This plugin can be used to create lvm volumes of specified size, which can
then be bind mounted into the container using `docker run` command.
%enable_gotoolset7
%{?enable_gotoolset110}
%prep
%setup -q -n %{name}-%{commit_docker}
@@ -323,8 +318,8 @@
mkdir -p src/github.com/%{repo}/libnetwork
ln -s $(pwd)/* src/github.com/%{repo}/libnetwork
export GOPATH=$(pwd)
LDFLAGS="-linkmode=external" %gobuild -o %{repo}-proxy github.com/%{repo}/libnetwork/cmd/proxy
export LDFLAGS=''
export GO_LDFLAGS="-linkmode=external"
%gobuild -o %{repo}-proxy github.com/%{repo}/libnetwork/cmd/proxy
popd
mkdir _build
@@ -389,6 +384,7 @@
# build %%{repo}-runc
pushd runc-%{commit_runc}
export RUNC_VERSION=$(cat ./VERSION)
mkdir -p GOPATH
pushd GOPATH
mkdir -p src/%{provider}.%{provider_tld}/opencontainers
@@ -398,6 +394,7 @@
pushd GOPATH/src/github.com/opencontainers/runc
export GOPATH=$(pwd)/GOPATH:$(pwd)/Godeps/_workspace
export BUILDTAGS='selinux seccomp'
export GO_LDFLAGS="-X main.gitCommit=%{commit_runc} -X main.version=$RUNC_VERSION"
%gobuild -o runc github.com/opencontainers/runc
pushd man
@@ -744,6 +741,14 @@
%{_bindir}/%{name}-v1.10-migrator-*
%changelog
* Wed Jan 16 2019 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-90.git07f3374
- Resolves: #1662700
- built docker-containerd @projectatomic/docker-1.13.1-rhel commit b968034
* Tue Jan 08 2019 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-89.git07f3374
- Resolves: #1661622 - fix docker-runc build
- use an additional GO_LDFLAGS to keep flags separate from those for tini
* Thu Dec 06 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-88.git07f3374
- Resolves: #1655214 - build with the correct golang deps