From 6242b9b5433a44627d45cb1b1de32cb44c79483c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 31 2019 18:58:27 +0000
Subject: import docker-1.13.1-90.git07f3374.el7


---

diff --git a/.docker.metadata b/.docker.metadata
index 62db2a1..471928d 100644
--- a/.docker.metadata
+++ b/.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
diff --git a/.gitignore b/.gitignore
index 2b9ca53..94377a1 100644
--- a/.gitignore
+++ b/.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
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SPECS/docker.spec b/SPECS/docker.spec
index 063c66c..8599c1f 100644
--- a/SPECS/docker.spec
+++ b/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 @@ scl enable go-toolset-1.10 -- go build -buildmode pie -compiler gc -tags="rpm_cr
 
 # 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 @@ scl enable go-toolset-1.10 -- go build -buildmode pie -compiler gc -tags="rpm_cr
 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 @@ BuildRequires: glibc-static
 %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 @@ Docker Volume Driver for lvm volumes.
 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 @@ pushd libnetwork-%{commit_libnetwork}
 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 @@ popd
 
 # 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 @@ popd
 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 @@ fi
 %{_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