Browse code
update remaining Go versions to 1.5.4
Some Dockerfiles were missed during update to
1.5.4. This changes those Dockerfiles.
Note that Dockerfile.armhf is not yet updated; it
currently uses Dave Cheney's unofficial ARM builds,
which are marked "end of life", so added a TODO
instead.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2016/04/13 18:13:06Showing 15 changed files
- Dockerfile.armhf
- Dockerfile.windows
- contrib/builder/deb/amd64/debian-jessie/Dockerfile
- contrib/builder/deb/amd64/debian-stretch/Dockerfile
- contrib/builder/deb/amd64/debian-wheezy/Dockerfile
- contrib/builder/deb/amd64/ubuntu-precise/Dockerfile
- contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile
- contrib/builder/deb/amd64/ubuntu-wily/Dockerfile
- contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile
- contrib/builder/rpm/amd64/centos-7/Dockerfile
- contrib/builder/rpm/amd64/fedora-22/Dockerfile
- contrib/builder/rpm/amd64/fedora-23/Dockerfile
- contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile
- contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile
- contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile
| ... | ... |
@@ -65,6 +65,8 @@ RUN cd /usr/local/lvm2 \ |
| 65 | 65 |
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL |
| 66 | 66 |
|
| 67 | 67 |
# Install Go |
| 68 |
+# TODO Update to 1.5.4 once available, or build from source, as these builds |
|
| 69 |
+# are marked "end of life", see http://dave.cheney.net/unofficial-arm-tarballs |
|
| 68 | 70 |
ENV GO_VERSION 1.5.3 |
| 69 | 71 |
RUN curl -fsSL "http://dave.cheney.net/paste/go${GO_VERSION}.linux-arm.tar.gz" \
|
| 70 | 72 |
| tar -xzC /usr/local |
| ... | ... |
@@ -40,7 +40,7 @@ FROM windowsservercore |
| 40 | 40 |
# Environment variable notes: |
| 41 | 41 |
# - GO_VERSION must consistent with 'Dockerfile' used by Linux'. |
| 42 | 42 |
# - FROM_DOCKERFILE is used for detection of building within a container. |
| 43 |
-ENV GO_VERSION=1.5.3 \ |
|
| 43 |
+ENV GO_VERSION=1.5.4 \ |
|
| 44 | 44 |
GIT_LOCATION=https://github.com/git-for-windows/git/releases/download/v2.7.2.windows.1/Git-2.7.2-64-bit.exe \ |
| 45 | 45 |
RSRC_COMMIT=ba14da1f827188454a4591717fff29999010887f \ |
| 46 | 46 |
GOPATH=C:/go;C:/go/src/github.com/docker/docker/vendor \ |
| ... | ... |
@@ -6,7 +6,7 @@ FROM debian:jessie |
| 6 | 6 |
|
| 7 | 7 |
RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 8 | 8 |
|
| 9 |
-ENV GO_VERSION 1.5.3 |
|
| 9 |
+ENV GO_VERSION 1.5.4 |
|
| 10 | 10 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 11 | 11 |
ENV PATH $PATH:/usr/local/go/bin |
| 12 | 12 |
|
| ... | ... |
@@ -6,7 +6,7 @@ FROM debian:stretch |
| 6 | 6 |
|
| 7 | 7 |
RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 8 | 8 |
|
| 9 |
-ENV GO_VERSION 1.5.3 |
|
| 9 |
+ENV GO_VERSION 1.5.4 |
|
| 10 | 10 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 11 | 11 |
ENV PATH $PATH:/usr/local/go/bin |
| 12 | 12 |
|
| ... | ... |
@@ -7,7 +7,7 @@ FROM debian:wheezy-backports |
| 7 | 7 |
RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 8 | 8 |
RUN apt-get update && apt-get install -y apparmor bash-completion build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 9 | 9 |
|
| 10 |
-ENV GO_VERSION 1.5.3 |
|
| 10 |
+ENV GO_VERSION 1.5.4 |
|
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 12 | 12 |
ENV PATH $PATH:/usr/local/go/bin |
| 13 | 13 |
|
| ... | ... |
@@ -6,7 +6,7 @@ FROM ubuntu:precise |
| 6 | 6 |
|
| 7 | 7 |
RUN apt-get update && apt-get install -y apparmor bash-completion build-essential curl ca-certificates debhelper dh-apparmor git libapparmor-dev libltdl-dev libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 8 | 8 |
|
| 9 |
-ENV GO_VERSION 1.5.3 |
|
| 9 |
+ENV GO_VERSION 1.5.4 |
|
| 10 | 10 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 11 | 11 |
ENV PATH $PATH:/usr/local/go/bin |
| 12 | 12 |
|
| ... | ... |
@@ -6,7 +6,7 @@ FROM ubuntu:trusty |
| 6 | 6 |
|
| 7 | 7 |
RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 8 | 8 |
|
| 9 |
-ENV GO_VERSION 1.5.3 |
|
| 9 |
+ENV GO_VERSION 1.5.4 |
|
| 10 | 10 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 11 | 11 |
ENV PATH $PATH:/usr/local/go/bin |
| 12 | 12 |
|
| ... | ... |
@@ -6,7 +6,7 @@ FROM ubuntu:wily |
| 6 | 6 |
|
| 7 | 7 |
RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 8 | 8 |
|
| 9 |
-ENV GO_VERSION 1.5.3 |
|
| 9 |
+ENV GO_VERSION 1.5.4 |
|
| 10 | 10 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 11 | 11 |
ENV PATH $PATH:/usr/local/go/bin |
| 12 | 12 |
|
| ... | ... |
@@ -6,7 +6,7 @@ FROM ubuntu:xenial |
| 6 | 6 |
|
| 7 | 7 |
RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 8 | 8 |
|
| 9 |
-ENV GO_VERSION 1.5.3 |
|
| 9 |
+ENV GO_VERSION 1.5.4 |
|
| 10 | 10 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 11 | 11 |
ENV PATH $PATH:/usr/local/go/bin |
| 12 | 12 |
|
| ... | ... |
@@ -8,7 +8,7 @@ RUN yum groupinstall -y "Development Tools" |
| 8 | 8 |
RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs |
| 9 | 9 |
RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git |
| 10 | 10 |
|
| 11 |
-ENV GO_VERSION 1.5.3 |
|
| 11 |
+ENV GO_VERSION 1.5.4 |
|
| 12 | 12 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 13 | 13 |
ENV PATH $PATH:/usr/local/go/bin |
| 14 | 14 |
|
| ... | ... |
@@ -7,7 +7,7 @@ FROM fedora:22 |
| 7 | 7 |
RUN dnf install -y @development-tools fedora-packager |
| 8 | 8 |
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 sqlite-devel systemd-devel tar git |
| 9 | 9 |
|
| 10 |
-ENV GO_VERSION 1.5.3 |
|
| 10 |
+ENV GO_VERSION 1.5.4 |
|
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 12 | 12 |
ENV PATH $PATH:/usr/local/go/bin |
| 13 | 13 |
|
| ... | ... |
@@ -7,7 +7,7 @@ FROM fedora:23 |
| 7 | 7 |
RUN dnf install -y @development-tools fedora-packager |
| 8 | 8 |
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 sqlite-devel systemd-devel tar git |
| 9 | 9 |
|
| 10 |
-ENV GO_VERSION 1.5.3 |
|
| 10 |
+ENV GO_VERSION 1.5.4 |
|
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 12 | 12 |
ENV PATH $PATH:/usr/local/go/bin |
| 13 | 13 |
|
| ... | ... |
@@ -7,7 +7,7 @@ FROM opensuse:13.2 |
| 7 | 7 |
RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build |
| 8 | 8 |
RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git systemd-rpm-macros |
| 9 | 9 |
|
| 10 |
-ENV GO_VERSION 1.5.3 |
|
| 10 |
+ENV GO_VERSION 1.5.4 |
|
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 12 | 12 |
ENV PATH $PATH:/usr/local/go/bin |
| 13 | 13 |
|
| ... | ... |
@@ -10,7 +10,7 @@ RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinu |
| 10 | 10 |
RUN yum install -y yum-utils && curl -o /etc/yum.repos.d/public-yum-ol6.repo http://yum.oracle.com/public-yum-ol6.repo && yum-config-manager -q --enable ol6_UEKR4 |
| 11 | 11 |
RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek |
| 12 | 12 |
|
| 13 |
-ENV GO_VERSION 1.5.3 |
|
| 13 |
+ENV GO_VERSION 1.5.4 |
|
| 14 | 14 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 15 | 15 |
ENV PATH $PATH:/usr/local/go/bin |
| 16 | 16 |
|
| ... | ... |
@@ -7,7 +7,7 @@ FROM oraclelinux:7 |
| 7 | 7 |
RUN yum groupinstall -y "Development Tools" |
| 8 | 8 |
RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git |
| 9 | 9 |
|
| 10 |
-ENV GO_VERSION 1.5.3 |
|
| 10 |
+ENV GO_VERSION 1.5.4 |
|
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 12 | 12 |
ENV PATH $PATH:/usr/local/go/bin |
| 13 | 13 |
|