From 5b5e980ec31e6a28f0e4149271d07136add01c5c Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 26 Oct 2017 16:02:01 -0700 Subject: [PATCH 1/7] Adds initial Jenkinsfile. Signed-off-by: Eli Uriegas Upstream-commit: 31a08611f6b87f71d673ab254471826eed225858 Component: packaging --- components/packaging/Jenkinsfile | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 components/packaging/Jenkinsfile diff --git a/components/packaging/Jenkinsfile b/components/packaging/Jenkinsfile new file mode 100644 index 0000000000..bfbf1e8a48 --- /dev/null +++ b/components/packaging/Jenkinsfile @@ -0,0 +1,46 @@ +#!groovy + +def stageWithGithubNotify(String name, Closure cl) { + def notify = { String status -> + safeGithubNotify([context: name, targetUrl: "${BUILD_URL}/flowGraphTable"] + [status: status]) + } + + stage(name) { + notify 'PENDING' + try { + cl() + } catch (err) { + addFailedStage(name) + notify 'FAILURE' + throw err + } + notify 'SUCCESS' + } +} + +parallel { + stageWithGithubNotify('Ubuntu Xenial Debian Package') { + wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + checkout scm + sh("git clone https://github.com/docker/cli.git") + sh("git clone https://github.com/moby/moby.git") + sh("make DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=moby CLI_DIR=cli deb") + } + }, + stageWithGithubNotify('Centos 7 RPM Package') { + wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + checkout scm + sh("git clone https://github.com/docker/cli.git") + sh("git clone https://github.com/moby/moby.git") + sh("make DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=moby CLI_DIR=cli rpm") + } + } + stageWithGithubNotify('Static Linux Binaries') { + wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + checkout scm + sh("git clone https://github.com/docker/cli.git") + sh("git clone https://github.com/moby/moby.git") + sh("make DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=moby CLI_DIR=cli static") + } + } +} From b63d8b8465dd3ba0e94bcf8d0628168e76849f43 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 1 Dec 2017 21:20:05 +0000 Subject: [PATCH 2/7] Remove fancy github context notifiers They don't function correctly and they're not worth it Signed-off-by: Eli Uriegas Upstream-commit: 3f5a6f288ad7e134abb4ac99e56cbbca17bfae88 Component: packaging --- components/packaging/Jenkinsfile | 70 ++++++++++++++------------------ 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/components/packaging/Jenkinsfile b/components/packaging/Jenkinsfile index bfbf1e8a48..259afa2b14 100644 --- a/components/packaging/Jenkinsfile +++ b/components/packaging/Jenkinsfile @@ -1,46 +1,36 @@ #!groovy -def stageWithGithubNotify(String name, Closure cl) { - def notify = { String status -> - safeGithubNotify([context: name, targetUrl: "${BUILD_URL}/flowGraphTable"] + [status: status]) - } - - stage(name) { - notify 'PENDING' - try { - cl() - } catch (err) { - addFailedStage(name) - notify 'FAILURE' - throw err - } - notify 'SUCCESS' - } -} - -parallel { - stageWithGithubNotify('Ubuntu Xenial Debian Package') { - wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { - checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=moby CLI_DIR=cli deb") +test_steps = [ + 'deb': { -> + stage('Ubuntu Xenial Debian Package') { + wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + checkout scm + sh("git clone https://github.com/docker/cli.git") + sh("git clone https://github.com/moby/moby.git") + sh("make DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=moby CLI_DIR=cli deb") + } } }, - stageWithGithubNotify('Centos 7 RPM Package') { - wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { - checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=moby CLI_DIR=cli rpm") + 'rpm': { -> + stage('Centos 7 RPM Package') { + wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + checkout scm + sh("git clone https://github.com/docker/cli.git") + sh("git clone https://github.com/moby/moby.git") + sh("make DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=moby CLI_DIR=cli rpm") + } } - } - stageWithGithubNotify('Static Linux Binaries') { - wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { - checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=moby CLI_DIR=cli static") + }, + 'static': { -> + stage('Static Linux Binaries') { + wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { + checkout scm + sh("git clone https://github.com/docker/cli.git") + sh("git clone https://github.com/moby/moby.git") + sh("make DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=moby CLI_DIR=cli static") + } } - } -} + }, +] + +parallel(test_steps) From 3cd9275696bbf0bf7a54a45bb7f9e41504b3fc10 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 1 Dec 2017 21:50:35 +0000 Subject: [PATCH 3/7] Make directory references absolute Signed-off-by: Eli Uriegas Upstream-commit: bca63242a9c166a944619019da6e0b50f03b4233 Component: packaging --- components/packaging/Jenkinsfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components/packaging/Jenkinsfile b/components/packaging/Jenkinsfile index 259afa2b14..89ed953ad5 100644 --- a/components/packaging/Jenkinsfile +++ b/components/packaging/Jenkinsfile @@ -5,9 +5,9 @@ test_steps = [ stage('Ubuntu Xenial Debian Package') { wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=moby CLI_DIR=cli deb") + sh('git clone https://github.com/docker/cli.git') + sh('git clone https://github.com/moby/moby.git') + sh('make DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli deb') } } }, @@ -15,9 +15,9 @@ test_steps = [ stage('Centos 7 RPM Package') { wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=moby CLI_DIR=cli rpm") + sh('git clone https://github.com/docker/cli.git') + sh('git clone https://github.com/moby/moby.git') + sh('make DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli rpm') } } }, @@ -25,9 +25,9 @@ test_steps = [ stage('Static Linux Binaries') { wrappedNode(label: 'docker-edge && x86_64', cleanWorkspace: true) { checkout scm - sh("git clone https://github.com/docker/cli.git") - sh("git clone https://github.com/moby/moby.git") - sh("make DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=moby CLI_DIR=cli static") + sh('git clone https://github.com/docker/cli.git') + sh('git clone https://github.com/moby/moby.git') + sh('make DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli static') } } }, From 29875cbb8587eafe4c61e58d6eec51b3ce8d8147 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 1 Dec 2017 12:05:33 -0800 Subject: [PATCH 4/7] use golang 1.9.2 Signed-off-by: Andrew Hsu Upstream-commit: 0c04ba6701d462b173ed63bdcd9a55c0e95d8ce1 Component: packaging --- components/packaging/deb/debian-buster/Dockerfile.armv7l | 2 +- components/packaging/deb/debian-buster/Dockerfile.x86_64 | 2 +- components/packaging/deb/debian-jessie/Dockerfile.armv7l | 2 +- components/packaging/deb/debian-jessie/Dockerfile.x86_64 | 2 +- components/packaging/deb/debian-stretch/Dockerfile.armv7l | 2 +- components/packaging/deb/debian-stretch/Dockerfile.x86_64 | 2 +- components/packaging/deb/debian-wheezy/Dockerfile.x86_64 | 2 +- components/packaging/deb/raspbian-jessie/Dockerfile.armv7l | 2 +- components/packaging/deb/raspbian-stretch/Dockerfile.armv7l | 2 +- components/packaging/deb/ubuntu-artful/Dockerfile.armv7l | 2 +- components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le | 2 +- components/packaging/deb/ubuntu-artful/Dockerfile.s390x | 2 +- components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 | 2 +- components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l | 2 +- components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 | 2 +- components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 | 2 +- components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l | 2 +- components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le | 2 +- components/packaging/deb/ubuntu-xenial/Dockerfile.s390x | 2 +- components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 | 2 +- components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l | 2 +- components/packaging/deb/ubuntu-zesty/Dockerfile.ppc64le | 2 +- components/packaging/deb/ubuntu-zesty/Dockerfile.s390x | 2 +- components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64 | 2 +- components/packaging/rpm/centos-7/Dockerfile.x86_64 | 2 +- components/packaging/rpm/fedora-25/Dockerfile.x86_64 | 2 +- components/packaging/rpm/fedora-26/Dockerfile.x86_64 | 2 +- components/packaging/rpm/fedora-27/Dockerfile.x86_64 | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/components/packaging/deb/debian-buster/Dockerfile.armv7l b/components/packaging/deb/debian-buster/Dockerfile.armv7l index 95a1151d41..555442cace 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.armv7l +++ b/components/packaging/deb/debian-buster/Dockerfile.armv7l @@ -6,7 +6,7 @@ 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-buster/Dockerfile.x86_64 b/components/packaging/deb/debian-buster/Dockerfile.x86_64 index 7367975143..03fbf90ddb 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-buster/Dockerfile.x86_64 @@ -6,7 +6,7 @@ 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-jessie/Dockerfile.armv7l b/components/packaging/deb/debian-jessie/Dockerfile.armv7l index edaac507a5..b3a350121e 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.armv7l +++ b/components/packaging/deb/debian-jessie/Dockerfile.armv7l @@ -6,7 +6,7 @@ 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 libudev-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-jessie/Dockerfile.x86_64 b/components/packaging/deb/debian-jessie/Dockerfile.x86_64 index 5e128aa2d4..509d2c4853 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-jessie/Dockerfile.x86_64 @@ -6,7 +6,7 @@ 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 libudev-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-stretch/Dockerfile.armv7l b/components/packaging/deb/debian-stretch/Dockerfile.armv7l index 0687030c88..2e755f5738 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.armv7l +++ b/components/packaging/deb/debian-stretch/Dockerfile.armv7l @@ -6,7 +6,7 @@ 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-stretch/Dockerfile.x86_64 b/components/packaging/deb/debian-stretch/Dockerfile.x86_64 index 9f45fbef3e..342ed67a5b 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-stretch/Dockerfile.x86_64 @@ -6,7 +6,7 @@ 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.x86_64 b/components/packaging/deb/debian-wheezy/Dockerfile.x86_64 index 4a3abb1453..05efc417c0 100644 --- a/components/packaging/deb/debian-wheezy/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-wheezy/Dockerfile.x86_64 @@ -8,7 +8,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y apparmor bash-completion build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libudev-dev pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l b/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l index 85cccedc30..96b005f645 100644 --- a/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l +++ b/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l @@ -6,7 +6,7 @@ RUN sed -ri "s/archive.raspbian.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 libudev-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 ENV GOARM 6 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go diff --git a/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l b/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l index 9e431ffc9a..ac31852c16 100644 --- a/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l +++ b/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l @@ -6,7 +6,7 @@ RUN sed -ri "s/archive.raspbian.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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 ENV GOARM 6 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l b/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l index afaed90e26..85fd50a859 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l @@ -2,7 +2,7 @@ FROM arm32v7/ubuntu:artful 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le b/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le index c60b44f4db..9332cecb7e 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le @@ -2,7 +2,7 @@ FROM ppc64le/ubuntu:artful 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 pkg-config vim-common libseccomp-dev libsystemd-dev libltdl-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.s390x b/components/packaging/deb/ubuntu-artful/Dockerfile.s390x index 348f5ab706..89700cb4f4 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.s390x +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.s390x @@ -2,7 +2,7 @@ FROM s390x/ubuntu:artful 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 index b625e1f728..d3f8711105 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 @@ -2,7 +2,7 @@ FROM ubuntu:artful 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l index 9aea84518a..b1011954b7 100644 --- a/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l @@ -4,7 +4,7 @@ FROM arm32v7/ubuntu:trusty RUN sed -i 's|security.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|' /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 pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 index e3e3a0e3d0..a9081b7f01 100644 --- a/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 @@ -2,7 +2,7 @@ FROM ubuntu:trusty 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 pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 index baebd37008..d195bcc2d8 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y golang-go apparmor bash-completion btrf # bootstrap, so we use golang-go (1.6) as bootstrap to build Go from source code. # We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because # not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8. -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \ && cd /usr/src/go/src \ && GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l index ec53b3d8f4..fb8d916bcd 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l @@ -2,7 +2,7 @@ FROM arm32v7/ubuntu:xenial 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le b/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le index 45e5262c40..af82a0cee2 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le @@ -2,7 +2,7 @@ FROM ppc64le/ubuntu:xenial 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x b/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x index 8440541e2e..2b4e87774d 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x @@ -2,7 +2,7 @@ FROM s390x/ubuntu:xenial 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 index f6d1d73588..954319f8fb 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 @@ -2,7 +2,7 @@ FROM ubuntu:xenial 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l b/components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l index 9873dce261..0c4251616d 100644 --- a/components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l @@ -2,7 +2,7 @@ FROM arm32v7/ubuntu:zesty 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.ppc64le b/components/packaging/deb/ubuntu-zesty/Dockerfile.ppc64le index d672317aba..be71049803 100644 --- a/components/packaging/deb/ubuntu-zesty/Dockerfile.ppc64le +++ b/components/packaging/deb/ubuntu-zesty/Dockerfile.ppc64le @@ -2,7 +2,7 @@ FROM ppc64le/ubuntu:zesty 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 pkg-config vim-common libseccomp-dev libsystemd-dev libltdl-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.s390x b/components/packaging/deb/ubuntu-zesty/Dockerfile.s390x index 78e75061e3..5dd37d51ac 100644 --- a/components/packaging/deb/ubuntu-zesty/Dockerfile.s390x +++ b/components/packaging/deb/ubuntu-zesty/Dockerfile.s390x @@ -2,7 +2,7 @@ FROM s390x/ubuntu:zesty 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64 index c02a22095e..89a77a16aa 100644 --- a/components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64 @@ -2,7 +2,7 @@ FROM ubuntu:zesty 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 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/rpm/centos-7/Dockerfile.x86_64 b/components/packaging/rpm/centos-7/Dockerfile.x86_64 index d51b5c21e2..9388fa7ec9 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.x86_64 +++ b/components/packaging/rpm/centos-7/Dockerfile.x86_64 @@ -17,7 +17,7 @@ RUN yum install -y \ rpmdevtools \ vim-common -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 ENV DISTRO centos ENV SUITE 7 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-25/Dockerfile.x86_64 b/components/packaging/rpm/fedora-25/Dockerfile.x86_64 index 604b3a4d88..8147d5a4cf 100644 --- a/components/packaging/rpm/fedora-25/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-25/Dockerfile.x86_64 @@ -2,7 +2,7 @@ FROM fedora:25 RUN dnf -y upgrade RUN dnf install -y @development-tools fedora-packager RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 ENV DISTRO fedora ENV SUITE 25 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-26/Dockerfile.x86_64 b/components/packaging/rpm/fedora-26/Dockerfile.x86_64 index 6f4aa45052..515fbfacd3 100644 --- a/components/packaging/rpm/fedora-26/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-26/Dockerfile.x86_64 @@ -2,7 +2,7 @@ FROM fedora:26 RUN dnf -y upgrade RUN dnf install -y @development-tools fedora-packager RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 ENV DISTRO fedora ENV SUITE 26 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-27/Dockerfile.x86_64 b/components/packaging/rpm/fedora-27/Dockerfile.x86_64 index 18eb6f0550..22708fc141 100644 --- a/components/packaging/rpm/fedora-27/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-27/Dockerfile.x86_64 @@ -2,7 +2,7 @@ FROM fedora:27 RUN dnf -y upgrade RUN dnf install -y @development-tools fedora-packager RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common -ENV GO_VERSION 1.8.5 +ENV GO_VERSION 1.9.2 ENV DISTRO fedora ENV SUITE 27 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local From 9b80ff5665c67ccc1846267de82975c60448aa1a Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 1 Dec 2017 14:56:19 -0800 Subject: [PATCH 5/7] use pre-compiled golang arm64 toolset Signed-off-by: Andrew Hsu Upstream-commit: 30c250b285e758b295e010eee64b726cdac0e7be Component: packaging --- components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 index d195bcc2d8..81dfd98056 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 @@ -8,10 +8,7 @@ RUN apt-get update && apt-get install -y golang-go apparmor bash-completion btrf # We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because # not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8. ENV GO_VERSION 1.9.2 -RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \ - && cd /usr/src/go/src \ - && GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash - +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH /go/bin:/usr/src/go/bin:$PATH ENV DOCKER_BUILDTAGS apparmor seccomp selinux From 469adac6a027df2e0aecb68126394bc00c747ef6 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 1 Dec 2017 15:19:41 -0800 Subject: [PATCH 6/7] set VERSION when building packages Setting to something that will not be confused with a version number that will ever be released. Also, this is required for the deb packages to build properly Signed-off-by: Andrew Hsu Upstream-commit: 0de78bd1251958a9d8916c3944b8f51d0ffb49b7 Component: packaging --- components/packaging/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/packaging/Jenkinsfile b/components/packaging/Jenkinsfile index 89ed953ad5..00b596c816 100644 --- a/components/packaging/Jenkinsfile +++ b/components/packaging/Jenkinsfile @@ -7,7 +7,7 @@ test_steps = [ checkout scm sh('git clone https://github.com/docker/cli.git') sh('git clone https://github.com/moby/moby.git') - sh('make DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli deb') + sh('make VERSION=0.0.1-dev DOCKER_BUILD_PKGS=ubuntu-xenial ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli deb') } } }, @@ -17,7 +17,7 @@ test_steps = [ checkout scm sh('git clone https://github.com/docker/cli.git') sh('git clone https://github.com/moby/moby.git') - sh('make DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli rpm') + sh('make VERSION=0.0.1-dev DOCKER_BUILD_PKGS=centos-7 ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli rpm') } } }, @@ -27,7 +27,7 @@ test_steps = [ checkout scm sh('git clone https://github.com/docker/cli.git') sh('git clone https://github.com/moby/moby.git') - sh('make DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli static') + sh('make VERSION=0.0.1-dev DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=$(pwd)/moby CLI_DIR=$(pwd)/cli static') } } }, From 395b31b89610b276c7b90dd80a1220125b9c1222 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 1 Dec 2017 14:44:21 -0800 Subject: [PATCH 7/7] no need to detect alpine image Signed-off-by: Andrew Hsu Upstream-commit: 1b5ac32b06cb05ee61ea1b72e2147e983194ea73 Component: packaging --- components/packaging/deb/Makefile | 3 +-- components/packaging/detect_alpine_image | 21 --------------------- components/packaging/rpm/Makefile | 7 +++---- components/packaging/static/Makefile | 5 ++--- 4 files changed, 6 insertions(+), 30 deletions(-) delete mode 100755 components/packaging/detect_alpine_image diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 2cc01e7e45..ed5423a46e 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -1,12 +1,11 @@ SHELL:=/bin/bash -ALPINE_IMG:=$(shell $(CURDIR)/../detect_alpine_image) ARCH:=$(shell uname -m) ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=$(shell cat $(ENGINE_DIR)/VERSION) DOCKER_EXPERIMENTAL:=0 -CHOWN:=docker run --rm -v $(CURDIR):/v -w /v $(ALPINE_IMG) chown +CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown .PHONY: help clean deb ubuntu debian ubuntu-xenial ubuntu-trusty ubuntu-zesty debian-buster debian-jessie debian-stretch debian-wheezy raspbian-jessie raspbian-stretch diff --git a/components/packaging/detect_alpine_image b/components/packaging/detect_alpine_image deleted file mode 100755 index 4efa32e4aa..0000000000 --- a/components/packaging/detect_alpine_image +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env sh - -arch="$(uname -m)" -img="unknown" - -if [ "$arch" = "x86_64" ]; then - img="alpine" -elif [ "$arch" = "armv7l" ]; then - img="arm32v6/alpine" -elif [ "$arch" = "s390x" ]; then - img="s390x/alpine" -elif [ "$arch" = "aarch64" ]; then - img="arm64v8/alpine" -elif [ "$arch" = "ppc64le" ]; then - img="ppc64le/alpine" -else - echo "Architecture $(arch) not supported" - exit 1; -fi - -echo "$img" diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index b4f3f55f2e..7350ed3420 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -1,12 +1,11 @@ ARCH=$(shell uname -m) -ALPINE_IMG:=$(shell $(CURDIR)/../detect_alpine_image) ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION=$(shell cat $(ENGINE_DIR)/VERSION) DOCKER_EXPERIMENTAL=0 GEN_RPM_VER=$(shell ./gen-rpm-ver $(ENGINE_DIR) $(VERSION)) -CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v $(ALPINE_IMG) chown +CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown RPMBUILD=docker run --privileged --rm -i\ -v $(CURDIR)/rpmbuild/SOURCES:/root/rpmbuild/SOURCES \ -v $(CURDIR)/rpmbuild/BUILD:/root/rpmbuild/BUILD \ @@ -62,7 +61,7 @@ rpmbuild/SOURCES/cli.tgz: docker run --rm -i -w /v \ -v $(CLI_DIR):/cli \ -v $(CURDIR)/rpmbuild/SOURCES:/v \ - $(ALPINE_IMG) \ + alpine \ tar -C / -c -z -f /v/cli.tgz --exclude .git cli rpmbuild/SOURCES/engine.tgz: @@ -70,5 +69,5 @@ rpmbuild/SOURCES/engine.tgz: docker run --rm -i -w /v \ -v $(ENGINE_DIR):/engine \ -v $(CURDIR)/rpmbuild/SOURCES:/v \ - $(ALPINE_IMG) \ + alpine \ tar -C / -c -z -f /v/engine.tgz --exclude .git engine diff --git a/components/packaging/static/Makefile b/components/packaging/static/Makefile index d8d657d99e..6ac4dc1a34 100644 --- a/components/packaging/static/Makefile +++ b/components/packaging/static/Makefile @@ -1,9 +1,8 @@ SHELL:=/bin/bash -ALPINE_IMG:=$(shell $(CURDIR)/../detect_alpine_image) ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli VERSION=$(shell cat $(ENGINE_DIR)/VERSION) -CHOWN=docker run --rm -v $(CURDIR):/v -w /v $(ALPINE_IMG) chown +CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files DIR_TO_HASH:=build/linux @@ -39,7 +38,7 @@ cross-win: cross-all-cli cross-win-engine ## create zip file with windows x86_64 mkdir -p build/win/docker cp $(CLI_DIR)/build/docker-windows-amd64 build/win/docker/docker.exe cp $(ENGINE_DIR)/bundles/cross/windows/amd64/dockerd-$(VERSION).exe build/win/docker/dockerd.exe - docker run --rm -v $(CURDIR)/build/win:/v -w /v $(ALPINE_IMG) sh -c 'apk update&&apk add zip&&zip -r docker-$(VERSION).zip docker' + docker run --rm -v $(CURDIR)/build/win:/v -w /v alpine sh -c 'apk update&&apk add zip&&zip -r docker-$(VERSION).zip docker' $(CHOWN) -R $(shell id -u):$(shell id -g) build cross-arm: cross-all-cli ## create tgz with linux armhf client only