kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Added debian-jessie for aarch64

Browse source 
Adding debian-jessie as output for running make deb on aarch64. Also
update GO_VERSION to 1.8 to fix issues with incorrect pagesize.-

Signed-off-by: Boris Pruessmann <boris@pruessmann.org>
This commit is contained in:
Boris Pruessmann 2017-02-20 19:00:43 +01:00
parent 25500d56a5
commit f9543b339d
4 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
contrib/builder/deb/aarch64/debian-jessie/Dockerfile Normal file
View file

@ -0,0 +1,25 @@
#
# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/aarch64/generate.sh"!
#
FROM aarch64/debian:jessie
RUN echo deb http://ftp.debian.org/debian jessie-backports main > /etc/apt/sources.list.d/backports.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 golang-1.6-go --no-install-recommends && rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100
# Install Go
# aarch64 doesn't have official go binaries, so use the version of go installed from
# the image to build go from source.
ENV GO_VERSION 1.7.5
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
ENV PATH /usr/src/go/bin:$PATH
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
ENV RUNC_BUILDTAGS apparmor selinux

14
contrib/builder/deb/aarch64/generate.sh
View file

@ -61,7 +61,7 @@ for version in "${versions[@]}"; do
) )
case "$suite" in case "$suite" in
trusty) jessie|trusty)
packages+=( libsystemd-journal-dev ) packages+=( libsystemd-journal-dev )
# aarch64 doesn't have an official downloadable binary for go. # aarch64 doesn't have an official downloadable binary for go.
# And gccgo for trusty only includes Go 1.2 implementation which # And gccgo for trusty only includes Go 1.2 implementation which
@ -83,12 +83,20 @@ for version in "${versions[@]}"; do
;; ;;
esac esac
case "$suite" in
jessie)
echo 'RUN echo deb http://ftp.debian.org/debian jessie-backports main > /etc/apt/sources.list.d/backports.list' >> "$version/Dockerfile"
;;
*)
;;
esac
# update and install packages # update and install packages
echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile" echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"
echo >> "$version/Dockerfile" echo >> "$version/Dockerfile"
case "$suite" in case "$suite" in
trusty) jessie|trusty)
echo 'RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100' >> "$version/Dockerfile" echo 'RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100' >> "$version/Dockerfile"
echo >> "$version/Dockerfile" echo >> "$version/Dockerfile"
;; ;;
@ -106,7 +114,7 @@ for version in "${versions[@]}"; do
echo ' && GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash' >> "$version/Dockerfile" echo ' && GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash' >> "$version/Dockerfile"
echo >> "$version/Dockerfile" echo >> "$version/Dockerfile"
echo 'ENV PATH $PATH:/usr/src/go/bin' >> "$version/Dockerfile" echo 'ENV PATH /usr/src/go/bin:$PATH' >> "$version/Dockerfile"
echo >> "$version/Dockerfile" echo >> "$version/Dockerfile"
echo "ENV AUTO_GOPATH 1" >> "$version/Dockerfile" echo "ENV AUTO_GOPATH 1" >> "$version/Dockerfile"

2
contrib/builder/deb/aarch64/ubuntu-trusty/Dockerfile
View file

@ -16,7 +16,7 @@ RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.ta
&& cd /usr/src/go/src \ && cd /usr/src/go/src \
&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash && GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
ENV PATH $PATH:/usr/src/go/bin ENV PATH /usr/src/go/bin:$PATH
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1

2
contrib/builder/deb/aarch64/ubuntu-xenial/Dockerfile
View file

@ -14,7 +14,7 @@ RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.ta
&& cd /usr/src/go/src \ && cd /usr/src/go/src \
&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash && GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
ENV PATH $PATH:/usr/src/go/bin ENV PATH /usr/src/go/bin:$PATH
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1