p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master

Browse Source
This commit is contained in:
GordonTheTurtle
2017-12-05 19:13:46 +00:00
parent 8ca0b6eb11 cf1d97228e
commit cf5224adb2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/packaging/Jenkinsfile vendored
View File

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

2
components/packaging/deb/debian-jessie/Dockerfile.aarch64
View File

@ -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