From a9ea77004e9adbc7b8503ba1e8412747b9bcf25f Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Mon, 4 Dec 2017 21:17:25 +0000 Subject: [PATCH 1/2] Change label to one that actually exists Seems `docker-edge` was removed as label on jenkins.dockerproject.org. This removes that label and just puts the x86_64 label Signed-off-by: Eli Uriegas Upstream-commit: 6765382587e31a93b1e65d2d169b00a42d183ee2 Component: packaging --- components/packaging/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/packaging/Jenkinsfile b/components/packaging/Jenkinsfile index 00b596c816..5ef5a94f2a 100644 --- a/components/packaging/Jenkinsfile +++ b/components/packaging/Jenkinsfile @@ -3,7 +3,7 @@ test_steps = [ 'deb': { -> stage('Ubuntu Xenial Debian Package') { - wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + wrappedNode(label: 'ubuntu && x86_64', cleanWorkspace: true) { checkout scm sh('git clone https://github.com/docker/cli.git') sh('git clone https://github.com/moby/moby.git') @@ -13,7 +13,7 @@ test_steps = [ }, 'rpm': { -> stage('Centos 7 RPM Package') { - wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + wrappedNode(label: 'ubuntu && x86_64', cleanWorkspace: true) { checkout scm sh('git clone https://github.com/docker/cli.git') sh('git clone https://github.com/moby/moby.git') @@ -23,7 +23,7 @@ test_steps = [ }, 'static': { -> stage('Static Linux Binaries') { - wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + wrappedNode(label: 'ubuntu && x86_64', cleanWorkspace: true) { checkout scm sh('git clone https://github.com/docker/cli.git') sh('git clone https://github.com/moby/moby.git') From 57c8d644225d46285e4fbd849303b15991bbef4e Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Mon, 4 Dec 2017 23:36:16 +0000 Subject: [PATCH 2/2] Adds libudev-dev to jessie aarch64 build Failed out otherwise: ``` ---> Making bundle: dynbinary (in bundles/dynbinary) Building: bundles/dynbinary-daemon/dockerd-17.09.0-dev Package libudev was not found in the pkg-config search path. ``` Signed-off-by: Eli Uriegas Upstream-commit: 4d8e8855d1008f4705ea6db17e5cd5bc90bd2d81 Component: packaging --- components/packaging/deb/debian-jessie/Dockerfile.aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/deb/debian-jessie/Dockerfile.aarch64 b/components/packaging/deb/debian-jessie/Dockerfile.aarch64 index 39cf2e91a6..26109401df 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.aarch64 +++ b/components/packaging/deb/debian-jessie/Dockerfile.aarch64 @@ -4,7 +4,7 @@ FROM arm64v8/debian:jessie-backports ARG APT_MIRROR=deb.debian.org RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list -RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev gnupg dirmngr --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev libudev-dev gnupg dirmngr --no-install-recommends && rm -rf /var/lib/apt/lists/* ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local