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') 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