1. docker
  2. Commit f9543b339dcc47b28e0eb1b39b6a59b70ca3867e
Browse code

Added debian-jessie for aarch64

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>

Boris Pruessmann authored on 2017/02/21 03:00:43
Showing 4 changed files
contrib/builder/deb/aarch64/debian-jessie/Dockerfile
History View file @ f9543b3
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,25 @@
0 
+#
1 
+# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/aarch64/generate.sh"!
2 
+#
3 
+
4 
+FROM aarch64/debian:jessie
5 
+
6 
+RUN echo deb http://ftp.debian.org/debian jessie-backports main > /etc/apt/sources.list.d/backports.list
7 
+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/*
8 
+
9 
+RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100
10 
+
11 
+# Install Go
12 
+# aarch64 doesn't have official go binaries, so use the version of go installed from
13 
+# the image to build go from source.
14 
+ENV GO_VERSION 1.7.5
15 
+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 \
16 
+	&& cd /usr/src/go/src \
17 
+	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
18 
+
19 
+ENV PATH /usr/src/go/bin:$PATH
20 
+
21 
+ENV AUTO_GOPATH 1
22 
+
23 
+ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
24 
+ENV RUNC_BUILDTAGS apparmor selinux
contrib/builder/deb/aarch64/generate.sh
History View file @ f9543b3
... ... 
@@ -61,7 +61,7 @@ for version in "${versions[@]}"; do
61 61 
 	)
62 62
63 63 
 	case "$suite" in
64 
-		trusty)
64 
+		jessie|trusty)
65 65 
 			packages+=( libsystemd-journal-dev )
66 66 
 			# aarch64 doesn't have an official downloadable binary for go.
67 67 
 			# And gccgo for trusty only includes Go 1.2 implementation which
... ... 
@@ -83,12 +83,20 @@ for version in "${versions[@]}"; do
83 83 
 			;;
84 84 
 	esac
85 85
86 
+    case "$suite" in
87 
+        jessie)
88 
+            echo 'RUN echo deb http://ftp.debian.org/debian jessie-backports main > /etc/apt/sources.list.d/backports.list' >> "$version/Dockerfile"
89 
+            ;;
90 
+        *)
91 
+            ;;
92 
+    esac
93 
+
86 94 
 	# update and install packages
87 95 
 	echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"
88 96 
 	echo >> "$version/Dockerfile"
89 97
90 98 
 	case "$suite" in
91 
-		trusty)
99 
+		jessie|trusty)
92 100 
 			echo 'RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100' >> "$version/Dockerfile"
93 101 
 			echo >> "$version/Dockerfile"
94 102 
 			;;
... ... 
@@ -106,7 +114,7 @@ for version in "${versions[@]}"; do
106 106 
 	echo '	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash' >> "$version/Dockerfile"
107 107 
 	echo >> "$version/Dockerfile"
108 108
109 
-	echo 'ENV PATH $PATH:/usr/src/go/bin' >> "$version/Dockerfile"
109 
+	echo 'ENV PATH /usr/src/go/bin:$PATH' >> "$version/Dockerfile"
110 110 
 	echo >> "$version/Dockerfile"
111 111
112 112 
 	echo "ENV AUTO_GOPATH 1" >> "$version/Dockerfile"
contrib/builder/deb/aarch64/ubuntu-trusty/Dockerfile
History View file @ f9543b3
... ... 
@@ -16,7 +16,7 @@ RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.ta
16 16 
 	&& cd /usr/src/go/src \
17 17 
 	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
18 18
19 
-ENV PATH $PATH:/usr/src/go/bin
19 
+ENV PATH /usr/src/go/bin:$PATH
20 20
21 21 
 ENV AUTO_GOPATH 1
22 22
contrib/builder/deb/aarch64/ubuntu-xenial/Dockerfile
History View file @ f9543b3
... ... 
@@ -14,7 +14,7 @@ RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.ta
14 14 
 	&& cd /usr/src/go/src \
15 15 
 	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
16 16
17 
-ENV PATH $PATH:/usr/src/go/bin
17 
+ENV PATH /usr/src/go/bin:$PATH
18 18
19 19 
 ENV AUTO_GOPATH 1
20 20