From dd2cbf777c35245614bbfcea3789863e49f44013 Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Fri, 26 May 2017 11:36:55 -0700 Subject: [PATCH 1/5] Add DISTRO/SUITE env. variables to the RPM dockerfiles Signed-off-by: Roberto Gandolfo Hashioka Upstream-commit: c4a9e41495fac5e4aa72151b80200aa453f65e08 Component: packaging --- components/packaging/rpm/centos-7/Dockerfile.x86_64 | 2 ++ components/packaging/rpm/fedora-24/Dockerfile.x86_64 | 2 ++ components/packaging/rpm/fedora-25/Dockerfile.x86_64 | 2 ++ 3 files changed, 6 insertions(+) diff --git a/components/packaging/rpm/centos-7/Dockerfile.x86_64 b/components/packaging/rpm/centos-7/Dockerfile.x86_64 index 01313c9dfd..dd6c9da1c1 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.x86_64 +++ b/components/packaging/rpm/centos-7/Dockerfile.x86_64 @@ -18,6 +18,8 @@ RUN yum install -y \ vim-common ENV GO_VERSION 1.7.5 +ENV DISTRO centos +ENV SUITE 7 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local RUN mkdir -p /go ENV GOPATH=/go diff --git a/components/packaging/rpm/fedora-24/Dockerfile.x86_64 b/components/packaging/rpm/fedora-24/Dockerfile.x86_64 index 6666a296b8..17245bc8d7 100644 --- a/components/packaging/rpm/fedora-24/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-24/Dockerfile.x86_64 @@ -3,6 +3,8 @@ 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.1 +ENV DISTRO fedora +ENV SUITE 24 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin ENV AUTO_GOPATH 1 diff --git a/components/packaging/rpm/fedora-25/Dockerfile.x86_64 b/components/packaging/rpm/fedora-25/Dockerfile.x86_64 index e439f30b77..abcabe29d1 100644 --- a/components/packaging/rpm/fedora-25/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-25/Dockerfile.x86_64 @@ -3,6 +3,8 @@ 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.1 +ENV DISTRO fedora +ENV SUITE 25 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin ENV AUTO_GOPATH 1 From c7ff61d425bce56e32ae5ebbc82035935d68ec7b Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 26 May 2017 15:10:27 -0500 Subject: [PATCH 2/5] Add armhf dockerfiles for deb building (#4) Add armhf dockerfiles for deb building Signed-off-by: Eli Uriegas Upstream-commit: f0c8cea1b79b049743cd1503f7ac4a34c265f476 Component: packaging --- components/packaging/deb/Makefile | 3 +- components/packaging/deb/build-deb | 11 ++++-- components/packaging/deb/common/rules | 2 +- .../deb/debian-jessie/Dockerfile.armhf | 34 ++++++++++++++++++ .../deb/debian-stretch/Dockerfile.armhf | 34 ++++++++++++++++++ .../deb/debian-wheezy/Dockerfile.armhf | 36 +++++++++++++++++++ .../deb/ubuntu-trusty/Dockerfile.armhf | 30 ++++++++++++++++ .../deb/ubuntu-xenial/Dockerfile.armhf | 30 ++++++++++++++++ .../deb/ubuntu-yakkety/Dockerfile.armhf | 30 ++++++++++++++++ .../deb/ubuntu-zesty/Dockerfile.armhf | 30 ++++++++++++++++ components/packaging/detect_alpine_image | 17 +++++++++ 11 files changed, 252 insertions(+), 5 deletions(-) create mode 100644 components/packaging/deb/debian-jessie/Dockerfile.armhf create mode 100644 components/packaging/deb/debian-stretch/Dockerfile.armhf create mode 100644 components/packaging/deb/debian-wheezy/Dockerfile.armhf create mode 100644 components/packaging/deb/ubuntu-trusty/Dockerfile.armhf create mode 100644 components/packaging/deb/ubuntu-xenial/Dockerfile.armhf create mode 100644 components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf create mode 100644 components/packaging/deb/ubuntu-zesty/Dockerfile.armhf create mode 100755 components/packaging/detect_alpine_image diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 82bbb248f8..4c62c275fc 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -1,11 +1,12 @@ SHELL:=/bin/bash +ALPINE:=$(shell $(CURDIR)/../detect_alpine_image) ARCH:=amd64 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 chown +CHOWN:=docker run --rm -v $(CURDIR):/v -w /v $(ALPINE) chown .PHONY: help clean deb ubuntu debian ubuntu-xenial ubuntu-trusty ubuntu-yakkety ubuntu-zesty debian-jessie debian-stretch debian-wheezy diff --git a/components/packaging/deb/build-deb b/components/packaging/deb/build-deb index ffa8865ab5..2ca570f07f 100755 --- a/components/packaging/deb/build-deb +++ b/components/packaging/deb/build-deb @@ -1,9 +1,14 @@ #!/usr/bin/env bash set -x # I want to rip this install-binaries script out so badly -cd engine && \ - TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini && \ - cd - +cd engine +TMP_GOPATH="/go" bash hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini +if [[ $? -ne 0 ]]; then + echo "Binaries required for package building not installed correctly." + echo "Exiting..." + exit 1 +fi +cd - echo VERSION AAA $VERSION VERSION=${VERSION:-$( cat engine/VERSION )} diff --git a/components/packaging/deb/common/rules b/components/packaging/deb/common/rules index 74f4b7c8d9..9a9ed979f0 100644 --- a/components/packaging/deb/common/rules +++ b/components/packaging/deb/common/rules @@ -12,7 +12,7 @@ override_dh_gencontrol: override_dh_auto_build: cd engine && ./hack/make.sh dynbinary - cd cli && LDFLAGS='' make VERSION=$(VERSION) GITCOMMIT=$(DOCKER_GITCOMMIT) dynbinary + LDFLAGS='' make -C cli VERSION=$(VERSION) GITCOMMIT=$(DOCKER_GITCOMMIT) dynbinary # ./man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here override_dh_auto_test: diff --git a/components/packaging/deb/debian-jessie/Dockerfile.armhf b/components/packaging/deb/debian-jessie/Dockerfile.armhf new file mode 100644 index 0000000000..bab5162b88 --- /dev/null +++ b/components/packaging/deb/debian-jessie/Dockerfile.armhf @@ -0,0 +1,34 @@ +FROM armhf/debian:jessie + +# allow replacing httpredir or deb mirror +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 pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* + +ENV GO_VERSION 1.8.1 +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local +ENV PATH $PATH:/usr/local/go/bin + +ENV GOPATH /go + +ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux +ENV RUNC_BUILDTAGS apparmor selinux + +COPY common/ /root/build-deb/debian +COPY build-deb /root/build-deb/build-deb + +RUN mkdir -p /go/src/github.com/docker && \ + mkdir -p /go/src/github.com/opencontainers && \ + ln -snf /engine /root/build-deb/engine && \ + ln -snf /cli /root/build-deb/cli && \ + ln -snf /root/build-deb/engine /go/src/github.com/docker/docker && \ + ln -snf /root/build-deb/cli /go/src/github.com/docker/cli + + +ENV DISTRO debian +ENV SUITE jessie + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"] diff --git a/components/packaging/deb/debian-stretch/Dockerfile.armhf b/components/packaging/deb/debian-stretch/Dockerfile.armhf new file mode 100644 index 0000000000..a55b7c3f7e --- /dev/null +++ b/components/packaging/deb/debian-stretch/Dockerfile.armhf @@ -0,0 +1,34 @@ +FROM armhf/debian:stretch + +# allow replacing httpredir or deb mirror +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 --no-install-recommends && rm -rf /var/lib/apt/lists/* + +ENV GO_VERSION 1.8.1 +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local +ENV PATH $PATH:/usr/local/go/bin + +ENV GOPATH /go + +ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux +ENV RUNC_BUILDTAGS apparmor seccomp selinux + +COPY common/ /root/build-deb/debian +COPY build-deb /root/build-deb/build-deb + +RUN mkdir -p /go/src/github.com/docker && \ + mkdir -p /go/src/github.com/opencontainers && \ + ln -snf /engine /root/build-deb/engine && \ + ln -snf /cli /root/build-deb/cli && \ + ln -snf /root/build-deb/engine /go/src/github.com/docker/docker && \ + ln -snf /root/build-deb/cli /go/src/github.com/docker/cli + + +ENV DISTRO debian +ENV SUITE stretch + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"] diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.armhf b/components/packaging/deb/debian-wheezy/Dockerfile.armhf new file mode 100644 index 0000000000..10ef3fbe7d --- /dev/null +++ b/components/packaging/deb/debian-wheezy/Dockerfile.armhf @@ -0,0 +1,36 @@ +FROM armhf/debian:wheezy-backports + +# allow replacing httpredir or deb mirror +ARG APT_MIRROR=deb.debian.org +RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list +RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d/backports.list + +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 pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* + +ENV GO_VERSION 1.8.1 +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local +ENV PATH $PATH:/usr/local/go/bin + +ENV GOPATH /go + +ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux +ENV RUNC_BUILDTAGS apparmor selinux + +COPY common/ /root/build-deb/debian +COPY build-deb /root/build-deb/build-deb + +RUN mkdir -p /go/src/github.com/docker && \ + mkdir -p /go/src/github.com/opencontainers && \ + ln -snf /engine /root/build-deb/engine && \ + ln -snf /cli /root/build-deb/cli && \ + ln -snf /root/build-deb/engine /go/src/github.com/docker/docker && \ + ln -snf /root/build-deb/cli /go/src/github.com/docker/cli + + +ENV DISTRO debian +ENV SUITE wheezy + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"] diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.armhf b/components/packaging/deb/ubuntu-trusty/Dockerfile.armhf new file mode 100644 index 0000000000..1d4a5168d6 --- /dev/null +++ b/components/packaging/deb/ubuntu-trusty/Dockerfile.armhf @@ -0,0 +1,30 @@ +FROM armhf/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.1 +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local +ENV PATH $PATH:/usr/local/go/bin + +ENV GOPATH /go + +ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux +ENV RUNC_BUILDTAGS apparmor selinux + +COPY common/ /root/build-deb/debian +COPY build-deb /root/build-deb/build-deb + +RUN mkdir -p /go/src/github.com/docker && \ + mkdir -p /go/src/github.com/opencontainers && \ + ln -snf /engine /root/build-deb/engine && \ + ln -snf /cli /root/build-deb/cli && \ + ln -snf /root/build-deb/engine /go/src/github.com/docker/docker && \ + ln -snf /root/build-deb/cli /go/src/github.com/docker/cli + + +ENV DISTRO ubuntu +ENV SUITE trusty + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"] diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.armhf b/components/packaging/deb/ubuntu-xenial/Dockerfile.armhf new file mode 100644 index 0000000000..92e62d53e2 --- /dev/null +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.armhf @@ -0,0 +1,30 @@ +FROM armhf/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.1 +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local +ENV PATH $PATH:/usr/local/go/bin + +ENV GOPATH /go + +ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux +ENV RUNC_BUILDTAGS apparmor seccomp selinux + +COPY common/ /root/build-deb/debian +COPY build-deb /root/build-deb/build-deb + +RUN mkdir -p /go/src/github.com/docker && \ + mkdir -p /go/src/github.com/opencontainers && \ + ln -snf /engine /root/build-deb/engine && \ + ln -snf /cli /root/build-deb/cli && \ + ln -snf /root/build-deb/engine /go/src/github.com/docker/docker && \ + ln -snf /root/build-deb/cli /go/src/github.com/docker/cli + + +ENV DISTRO ubuntu +ENV SUITE xenial + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"] diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf b/components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf new file mode 100644 index 0000000000..65aa5d4c35 --- /dev/null +++ b/components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf @@ -0,0 +1,30 @@ +FROM armhf/ubuntu:yakkety + +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.1 +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local +ENV PATH $PATH:/usr/local/go/bin + +ENV GOPATH /go + +ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux +ENV RUNC_BUILDTAGS apparmor selinux + +COPY common/ /root/build-deb/debian +COPY build-deb /root/build-deb/build-deb + +RUN mkdir -p /go/src/github.com/docker && \ + mkdir -p /go/src/github.com/opencontainers && \ + ln -snf /engine /root/build-deb/engine && \ + ln -snf /cli /root/build-deb/cli && \ + ln -snf /root/build-deb/engine /go/src/github.com/docker/docker && \ + ln -snf /root/build-deb/cli /go/src/github.com/docker/cli + + +ENV DISTRO ubuntu +ENV SUITE yakkety + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"] diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.armhf b/components/packaging/deb/ubuntu-zesty/Dockerfile.armhf new file mode 100644 index 0000000000..58e1d7470b --- /dev/null +++ b/components/packaging/deb/ubuntu-zesty/Dockerfile.armhf @@ -0,0 +1,30 @@ +FROM armhf/ubuntu:yakkety + +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.1 +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local +ENV PATH $PATH:/usr/local/go/bin + +ENV GOPATH /go + +ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux +ENV RUNC_BUILDTAGS apparmor seccomp selinux + +COPY common/ /root/build-deb/debian +COPY build-deb /root/build-deb/build-deb + +RUN mkdir -p /go/src/github.com/docker && \ + mkdir -p /go/src/github.com/opencontainers && \ + ln -snf /engine /root/build-deb/engine && \ + ln -snf /cli /root/build-deb/cli && \ + ln -snf /root/build-deb/engine /go/src/github.com/docker/docker && \ + ln -snf /root/build-deb/cli /go/src/github.com/docker/cli + + +ENV DISTRO ubuntu +ENV SUITE zesty + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"] diff --git a/components/packaging/detect_alpine_image b/components/packaging/detect_alpine_image new file mode 100755 index 0000000000..282a49f9b8 --- /dev/null +++ b/components/packaging/detect_alpine_image @@ -0,0 +1,17 @@ +#!/usr/bin/env sh + +arch="$(uname -m)" +img="unknown" + +if [ "$arch" = "x86_64" ]; then + img="alpine" +elif [ "$arch" = "armv7l" ]; then + img="armhf/alpine" +elif [ "$arch" = "s390x" ]; then + img="s390x/alpine" +else + echo "Architecture $(arch) not supported" + exit 1; +fi + +echo "$img" From 66970d08f915647a7a4f1dd55291a3e220dd53ac Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 31 May 2017 11:06:42 -0500 Subject: [PATCH 3/5] Update GO_VERSION to 1.8.3 (#8) Signed-off-by: Eli Uriegas Upstream-commit: 121e1c478d94a9be5713e944dde113f8637d6e41 Component: packaging --- components/packaging/deb/debian-jessie/Dockerfile.amd64 | 2 +- components/packaging/deb/debian-jessie/Dockerfile.armhf | 2 +- components/packaging/deb/debian-stretch/Dockerfile.amd64 | 2 +- components/packaging/deb/debian-stretch/Dockerfile.armhf | 2 +- components/packaging/deb/debian-wheezy/Dockerfile.amd64 | 2 +- components/packaging/deb/debian-wheezy/Dockerfile.armhf | 2 +- components/packaging/deb/ubuntu-trusty/Dockerfile.amd64 | 2 +- components/packaging/deb/ubuntu-trusty/Dockerfile.armhf | 2 +- components/packaging/deb/ubuntu-xenial/Dockerfile.amd64 | 2 +- components/packaging/deb/ubuntu-xenial/Dockerfile.armhf | 2 +- components/packaging/deb/ubuntu-xenial/Dockerfile.s390x | 2 +- components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64 | 2 +- components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf | 2 +- components/packaging/deb/ubuntu-yakkety/Dockerfile.s390x | 2 +- components/packaging/deb/ubuntu-zesty/Dockerfile.amd64 | 2 +- components/packaging/deb/ubuntu-zesty/Dockerfile.armhf | 2 +- components/packaging/deb/ubuntu-zesty/Dockerfile.s390x | 2 +- components/packaging/rpm/fedora-24/Dockerfile.x86_64 | 2 +- components/packaging/rpm/fedora-25/Dockerfile.x86_64 | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/components/packaging/deb/debian-jessie/Dockerfile.amd64 b/components/packaging/deb/debian-jessie/Dockerfile.amd64 index 7b6b835b0e..d44c7955de 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.amd64 +++ b/components/packaging/deb/debian-jessie/Dockerfile.amd64 @@ -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 pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/debian-jessie/Dockerfile.armhf b/components/packaging/deb/debian-jessie/Dockerfile.armhf index bab5162b88..f7fca14e95 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.armhf +++ b/components/packaging/deb/debian-jessie/Dockerfile.armhf @@ -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 pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/debian-stretch/Dockerfile.amd64 b/components/packaging/deb/debian-stretch/Dockerfile.amd64 index dfc4010e74..c6ed8a93c5 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.amd64 +++ b/components/packaging/deb/debian-stretch/Dockerfile.amd64 @@ -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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/debian-stretch/Dockerfile.armhf b/components/packaging/deb/debian-stretch/Dockerfile.armhf index a55b7c3f7e..d50d2abd6e 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.armhf +++ b/components/packaging/deb/debian-stretch/Dockerfile.armhf @@ -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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.amd64 b/components/packaging/deb/debian-wheezy/Dockerfile.amd64 index 7cc4772839..c7627b27fb 100644 --- a/components/packaging/deb/debian-wheezy/Dockerfile.amd64 +++ b/components/packaging/deb/debian-wheezy/Dockerfile.amd64 @@ -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 pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.armhf b/components/packaging/deb/debian-wheezy/Dockerfile.armhf index 10ef3fbe7d..4c990d2d25 100644 --- a/components/packaging/deb/debian-wheezy/Dockerfile.armhf +++ b/components/packaging/deb/debian-wheezy/Dockerfile.armhf @@ -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 pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.8.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.amd64 b/components/packaging/deb/ubuntu-trusty/Dockerfile.amd64 index f277ee4cff..cde9ca847d 100644 --- a/components/packaging/deb/ubuntu-trusty/Dockerfile.amd64 +++ b/components/packaging/deb/ubuntu-trusty/Dockerfile.amd64 @@ -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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.armhf b/components/packaging/deb/ubuntu-trusty/Dockerfile.armhf index 1d4a5168d6..b766b5cf6c 100644 --- a/components/packaging/deb/ubuntu-trusty/Dockerfile.armhf +++ b/components/packaging/deb/ubuntu-trusty/Dockerfile.armhf @@ -2,7 +2,7 @@ FROM armhf/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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.amd64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.amd64 index 68527a4b02..bb622e7d51 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.amd64 +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.amd64 @@ -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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.armhf b/components/packaging/deb/ubuntu-xenial/Dockerfile.armhf index 92e62d53e2..4946f4b70a 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.armhf +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.armhf @@ -2,7 +2,7 @@ FROM armhf/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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x b/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x index f53f8ea248..9e4085d886 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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64 b/components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64 index 14cec175db..1f75a9de14 100644 --- a/components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64 +++ b/components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64 @@ -2,7 +2,7 @@ FROM ubuntu:yakkety 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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf b/components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf index 65aa5d4c35..f729e9283d 100644 --- a/components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf +++ b/components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf @@ -2,7 +2,7 @@ FROM armhf/ubuntu:yakkety 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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.s390x b/components/packaging/deb/ubuntu-yakkety/Dockerfile.s390x index e2284b853c..c50d678ef4 100644 --- a/components/packaging/deb/ubuntu-yakkety/Dockerfile.s390x +++ b/components/packaging/deb/ubuntu-yakkety/Dockerfile.s390x @@ -2,7 +2,7 @@ FROM s390x/ubuntu:yakkety 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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.amd64 b/components/packaging/deb/ubuntu-zesty/Dockerfile.amd64 index b25ee7e48f..e9ece83f38 100644 --- a/components/packaging/deb/ubuntu-zesty/Dockerfile.amd64 +++ b/components/packaging/deb/ubuntu-zesty/Dockerfile.amd64 @@ -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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.armhf b/components/packaging/deb/ubuntu-zesty/Dockerfile.armhf index 58e1d7470b..1a7d35d9de 100644 --- a/components/packaging/deb/ubuntu-zesty/Dockerfile.armhf +++ b/components/packaging/deb/ubuntu-zesty/Dockerfile.armhf @@ -2,7 +2,7 @@ FROM armhf/ubuntu:yakkety 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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.s390x b/components/packaging/deb/ubuntu-zesty/Dockerfile.s390x index 819b707b01..46ee96101e 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.1 +ENV GO_VERSION 1.8.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/components/packaging/rpm/fedora-24/Dockerfile.x86_64 b/components/packaging/rpm/fedora-24/Dockerfile.x86_64 index 17245bc8d7..569442689e 100644 --- a/components/packaging/rpm/fedora-24/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-24/Dockerfile.x86_64 @@ -2,7 +2,7 @@ FROM fedora:24 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.1 +ENV GO_VERSION 1.8.3 ENV DISTRO fedora ENV SUITE 24 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 abcabe29d1..ad737ce5ac 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.1 +ENV GO_VERSION 1.8.3 ENV DISTRO fedora ENV SUITE 25 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local From 4e36db9541b83c699b0eb6b388bd2d6811c8b2c9 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 31 May 2017 11:13:00 -0500 Subject: [PATCH 4/5] Rename deb dockerfiles to $(uname -m) equivalents Signed-off-by: Eli Uriegas Upstream-commit: 3f7e423438733fb5f593f666d12714ae2f63fcc9 Component: packaging --- .../deb/debian-jessie/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/debian-jessie/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/debian-stretch/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/debian-stretch/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/debian-wheezy/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/debian-wheezy/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/ubuntu-trusty/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/ubuntu-trusty/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/ubuntu-xenial/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/ubuntu-xenial/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/ubuntu-yakkety/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/ubuntu-yakkety/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 .../deb/ubuntu-zesty/{Dockerfile.armhf => Dockerfile.armv7l} | 0 .../deb/ubuntu-zesty/{Dockerfile.amd64 => Dockerfile.x86_64} | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename components/packaging/deb/debian-jessie/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/debian-jessie/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/debian-stretch/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/debian-stretch/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/debian-wheezy/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/debian-wheezy/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/ubuntu-trusty/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/ubuntu-trusty/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/ubuntu-xenial/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/ubuntu-xenial/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/ubuntu-yakkety/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/ubuntu-yakkety/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) rename components/packaging/deb/ubuntu-zesty/{Dockerfile.armhf => Dockerfile.armv7l} (100%) rename components/packaging/deb/ubuntu-zesty/{Dockerfile.amd64 => Dockerfile.x86_64} (100%) diff --git a/components/packaging/deb/debian-jessie/Dockerfile.armhf b/components/packaging/deb/debian-jessie/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/debian-jessie/Dockerfile.armhf rename to components/packaging/deb/debian-jessie/Dockerfile.armv7l diff --git a/components/packaging/deb/debian-jessie/Dockerfile.amd64 b/components/packaging/deb/debian-jessie/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/debian-jessie/Dockerfile.amd64 rename to components/packaging/deb/debian-jessie/Dockerfile.x86_64 diff --git a/components/packaging/deb/debian-stretch/Dockerfile.armhf b/components/packaging/deb/debian-stretch/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/debian-stretch/Dockerfile.armhf rename to components/packaging/deb/debian-stretch/Dockerfile.armv7l diff --git a/components/packaging/deb/debian-stretch/Dockerfile.amd64 b/components/packaging/deb/debian-stretch/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/debian-stretch/Dockerfile.amd64 rename to components/packaging/deb/debian-stretch/Dockerfile.x86_64 diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.armhf b/components/packaging/deb/debian-wheezy/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/debian-wheezy/Dockerfile.armhf rename to components/packaging/deb/debian-wheezy/Dockerfile.armv7l diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.amd64 b/components/packaging/deb/debian-wheezy/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/debian-wheezy/Dockerfile.amd64 rename to components/packaging/deb/debian-wheezy/Dockerfile.x86_64 diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.armhf b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/ubuntu-trusty/Dockerfile.armhf rename to components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.amd64 b/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/ubuntu-trusty/Dockerfile.amd64 rename to components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.armhf b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/ubuntu-xenial/Dockerfile.armhf rename to components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.amd64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/ubuntu-xenial/Dockerfile.amd64 rename to components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf b/components/packaging/deb/ubuntu-yakkety/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/ubuntu-yakkety/Dockerfile.armhf rename to components/packaging/deb/ubuntu-yakkety/Dockerfile.armv7l diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64 b/components/packaging/deb/ubuntu-yakkety/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/ubuntu-yakkety/Dockerfile.amd64 rename to components/packaging/deb/ubuntu-yakkety/Dockerfile.x86_64 diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.armhf b/components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l similarity index 100% rename from components/packaging/deb/ubuntu-zesty/Dockerfile.armhf rename to components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.amd64 b/components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64 similarity index 100% rename from components/packaging/deb/ubuntu-zesty/Dockerfile.amd64 rename to components/packaging/deb/ubuntu-zesty/Dockerfile.x86_64 From f4929f012a336f8975b4ca9783601ecf35337c79 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 31 May 2017 11:15:19 -0500 Subject: [PATCH 5/5] Change ARCH to be reflective Signed-off-by: Eli Uriegas Upstream-commit: 930db40ec8424555612ce70781e94d5cb172aa4c Component: packaging --- components/packaging/deb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 4c62c275fc..5ca2b57f62 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -1,6 +1,6 @@ SHELL:=/bin/bash ALPINE:=$(shell $(CURDIR)/../detect_alpine_image) -ARCH:=amd64 +ARCH:=$(shell uname -m) ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)