Browse code
Rename Dockerfile.arm to Dockerfile.armhf to more clearly reflect the specific subversion of ARM it targets
Also, fix up some minor whitespace consistency issues, remove a little cruft, and update GOARM for armhf to 7 so that we're explicit.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Tianon Gravi authored on 2015/12/30 17:50:10Showing 4 changed files
| ... | ... |
@@ -223,10 +223,10 @@ RUN set -x \ |
| 223 | 223 |
# Build/install the tool for embedding resources in Windows binaries |
| 224 | 224 |
ENV RSRC_COMMIT e48dbf1b7fc464a9e85fcec450dddf80816b76e0 |
| 225 | 225 |
RUN set -x \ |
| 226 |
- && git clone https://github.com/akavel/rsrc.git /go/src/github.com/akavel/rsrc \ |
|
| 227 |
- && cd /go/src/github.com/akavel/rsrc \ |
|
| 228 |
- && git checkout -q $RSRC_COMMIT \ |
|
| 229 |
- && go install -v |
|
| 226 |
+ && git clone https://github.com/akavel/rsrc.git /go/src/github.com/akavel/rsrc \ |
|
| 227 |
+ && cd /go/src/github.com/akavel/rsrc \ |
|
| 228 |
+ && git checkout -q $RSRC_COMMIT \ |
|
| 229 |
+ && go install -v |
|
| 230 | 230 |
|
| 231 | 231 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |
| 232 | 232 |
ENTRYPOINT ["hack/dind"] |
| 233 | 233 |
deleted file mode 100644 |
| ... | ... |
@@ -1,210 +0,0 @@ |
| 1 |
-# This file describes the standard way to build Docker on ARM, using docker |
|
| 2 |
-# |
|
| 3 |
-# Usage: |
|
| 4 |
-# |
|
| 5 |
-# # Assemble the full dev environment. This is slow the first time. |
|
| 6 |
-# docker build -t docker -f Dockerfile.arm . |
|
| 7 |
-# |
|
| 8 |
-# # Mount your source in an interactive container for quick testing: |
|
| 9 |
-# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash |
|
| 10 |
-# |
|
| 11 |
-# # Run the test suite: |
|
| 12 |
-# docker run --privileged docker hack/make.sh test |
|
| 13 |
-# |
|
| 14 |
-# # Publish a release: |
|
| 15 |
-# docker run --privileged \ |
|
| 16 |
-# -e AWS_S3_BUCKET=baz \ |
|
| 17 |
-# -e AWS_ACCESS_KEY=foo \ |
|
| 18 |
-# -e AWS_SECRET_KEY=bar \ |
|
| 19 |
-# -e GPG_PASSPHRASE=gloubiboulga \ |
|
| 20 |
-# docker hack/release.sh |
|
| 21 |
-# |
|
| 22 |
-# Note: AppArmor used to mess with privileged mode, but this is no longer |
|
| 23 |
-# the case. Therefore, you don't have to disable it anymore. |
|
| 24 |
-# |
|
| 25 |
- |
|
| 26 |
-FROM ioft/armhf-ubuntu:14.04 |
|
| 27 |
-MAINTAINER Govinda Fichtner <govinda.fichtner@googlemail.com> (@_beagile_) |
|
| 28 |
- |
|
| 29 |
-# Packaged dependencies |
|
| 30 |
-RUN apt-get update && apt-get install -y \ |
|
| 31 |
- apparmor \ |
|
| 32 |
- aufs-tools \ |
|
| 33 |
- automake \ |
|
| 34 |
- bash-completion \ |
|
| 35 |
- btrfs-tools \ |
|
| 36 |
- build-essential \ |
|
| 37 |
- createrepo \ |
|
| 38 |
- curl \ |
|
| 39 |
- dpkg-sig \ |
|
| 40 |
- git \ |
|
| 41 |
- iptables \ |
|
| 42 |
- jq \ |
|
| 43 |
- libapparmor-dev \ |
|
| 44 |
- libcap-dev \ |
|
| 45 |
- libltdl-dev \ |
|
| 46 |
- libsqlite3-dev \ |
|
| 47 |
- libsystemd-journal-dev \ |
|
| 48 |
- libtool \ |
|
| 49 |
- mercurial \ |
|
| 50 |
- pkg-config \ |
|
| 51 |
- python-dev \ |
|
| 52 |
- python-mock \ |
|
| 53 |
- python-pip \ |
|
| 54 |
- python-websocket \ |
|
| 55 |
- s3cmd=1.1.0* \ |
|
| 56 |
- xfsprogs \ |
|
| 57 |
- tar \ |
|
| 58 |
- --no-install-recommends |
|
| 59 |
- |
|
| 60 |
-# Get lvm2 source for compiling statically |
|
| 61 |
-RUN git clone -b v2_02_103 https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 |
|
| 62 |
-# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags |
|
| 63 |
- |
|
| 64 |
-# Compile and install lvm2 |
|
| 65 |
-RUN cd /usr/local/lvm2 \ |
|
| 66 |
- && ./configure --enable-static_link \ |
|
| 67 |
- && make device-mapper \ |
|
| 68 |
- && make install_device-mapper |
|
| 69 |
-# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL |
|
| 70 |
- |
|
| 71 |
-# Install Go |
|
| 72 |
-ENV GO_VERSION 1.4.3 |
|
| 73 |
-RUN curl -sSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/local -xz \
|
|
| 74 |
- && mkdir -p /go/bin |
|
| 75 |
-ENV PATH /go/bin:/usr/local/go/bin:$PATH |
|
| 76 |
-ENV GOPATH /go:/go/src/github.com/docker/docker/vendor |
|
| 77 |
-# (set an explicit GOARM of 5 for maximum compatibility) |
|
| 78 |
-ENV GOARM 5 |
|
| 79 |
-RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1 |
|
| 80 |
- |
|
| 81 |
-# Compile Go for cross compilation |
|
| 82 |
-ENV DOCKER_CROSSPLATFORMS " " |
|
| 83 |
- |
|
| 84 |
-# This has been commented out and kept as reference because we don't support compiling with older Go anymore. |
|
| 85 |
-# ENV GOFMT_VERSION 1.3.3 |
|
| 86 |
-# RUN curl -sSL https://storage.googleapis.com/golang/go${GOFMT_VERSION}.$(go env GOOS)-$(go env GOARCH).tar.gz | tar -C /go/bin -xz --strip-components=2 go/bin/gofmt
|
|
| 87 |
- |
|
| 88 |
-# Update this sha when we upgrade to go 1.5.0 |
|
| 89 |
-ENV GO_TOOLS_COMMIT 069d2f3bcb68257b627205f0486d6cc69a231ff9 |
|
| 90 |
-# Grab Go's cover tool for dead-simple code coverage testing |
|
| 91 |
-# Grab Go's vet tool for examining go code to find suspicious constructs |
|
| 92 |
-# and help prevent errors that the compiler might not catch |
|
| 93 |
-RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ |
|
| 94 |
- && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ |
|
| 95 |
- && go install -v golang.org/x/tools/cmd/cover \ |
|
| 96 |
- && go install -v golang.org/x/tools/cmd/vet |
|
| 97 |
-# Grab Go's lint tool |
|
| 98 |
-ENV GO_LINT_COMMIT f42f5c1c440621302702cb0741e9d2ca547ae80f |
|
| 99 |
-RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \ |
|
| 100 |
- && (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \ |
|
| 101 |
- && go install -v github.com/golang/lint/golint |
|
| 102 |
- |
|
| 103 |
-# install seccomp |
|
| 104 |
-# this can be changed to the ubuntu package libseccomp-dev if dockerinit is removed, |
|
| 105 |
-# we need libseccomp.a (which the package does not provide) for dockerinit |
|
| 106 |
-ENV SECCOMP_VERSION v2.2.3 |
|
| 107 |
-RUN set -x \ |
|
| 108 |
- && export SECCOMP_PATH=$(mktemp -d) \ |
|
| 109 |
- && git clone https://github.com/seccomp/libseccomp.git "$SECCOMP_PATH" \ |
|
| 110 |
- && ( \ |
|
| 111 |
- cd "$SECCOMP_PATH" \ |
|
| 112 |
- && git checkout "$SECCOMP_VERSION" \ |
|
| 113 |
- && ./autogen.sh \ |
|
| 114 |
- && ./configure --prefix=/usr \ |
|
| 115 |
- && make \ |
|
| 116 |
- && make install \ |
|
| 117 |
- ) \ |
|
| 118 |
- && rm -rf "$SECCOMP_PATH" |
|
| 119 |
- |
|
| 120 |
-# Install registry |
|
| 121 |
-ENV REGISTRY_COMMIT ec87e9b6971d831f0eff752ddb54fb64693e51cd |
|
| 122 |
-RUN set -x \ |
|
| 123 |
- && export GOPATH="$(mktemp -d)" \ |
|
| 124 |
- && git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \ |
|
| 125 |
- && (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \ |
|
| 126 |
- && GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \ |
|
| 127 |
- go build -o /usr/local/bin/registry-v2 github.com/docker/distribution/cmd/registry \ |
|
| 128 |
- && rm -rf "$GOPATH" |
|
| 129 |
- |
|
| 130 |
-# Install notary server |
|
| 131 |
-# commented Notary temporary as we are waiting for an update of jose2go: https://github.com/docker/notary/issues/239 |
|
| 132 |
-# |
|
| 133 |
-# ENV NOTARY_COMMIT 8e8122eb5528f621afcd4e2854c47302f17392f7 |
|
| 134 |
-# RUN set -x \ |
|
| 135 |
-# && export GOPATH="$(mktemp -d)" \ |
|
| 136 |
-# && git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \ |
|
| 137 |
-# && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_COMMIT") \ |
|
| 138 |
-# && GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \ |
|
| 139 |
-# go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \ |
|
| 140 |
-# && rm -rf "$GOPATH" |
|
| 141 |
- |
|
| 142 |
-# Get the "docker-py" source so we can run their integration tests |
|
| 143 |
-ENV DOCKER_PY_COMMIT 139850f3f3b17357bab5ba3edfb745fb14043764 |
|
| 144 |
-RUN git clone https://github.com/docker/docker-py.git /docker-py \ |
|
| 145 |
- && cd /docker-py \ |
|
| 146 |
- && git checkout -q $DOCKER_PY_COMMIT |
|
| 147 |
- |
|
| 148 |
-# Setup s3cmd config |
|
| 149 |
-RUN { \
|
|
| 150 |
- echo '[default]'; \ |
|
| 151 |
- echo 'access_key=$AWS_ACCESS_KEY'; \ |
|
| 152 |
- echo 'secret_key=$AWS_SECRET_KEY'; \ |
|
| 153 |
- } > ~/.s3cfg |
|
| 154 |
- |
|
| 155 |
-# Set user.email so crosbymichael's in-container merge commits go smoothly |
|
| 156 |
-RUN git config --global user.email 'docker-dummy@example.com' |
|
| 157 |
- |
|
| 158 |
-# Add an unprivileged user to be used for tests which need it |
|
| 159 |
-RUN groupadd -r docker |
|
| 160 |
-RUN useradd --create-home --gid docker unprivilegeduser |
|
| 161 |
- |
|
| 162 |
-VOLUME /var/lib/docker |
|
| 163 |
-WORKDIR /go/src/github.com/docker/docker |
|
| 164 |
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux |
|
| 165 |
- |
|
| 166 |
-# Let us use a .bashrc file |
|
| 167 |
-RUN ln -sfv $PWD/.bashrc ~/.bashrc |
|
| 168 |
- |
|
| 169 |
-# Register Docker's bash completion. |
|
| 170 |
-RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker |
|
| 171 |
- |
|
| 172 |
-# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
|
| 173 |
-COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
|
| 174 |
-RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
|
| 175 |
- hypriot/armhf-busybox:latest@sha256:b0fc94dac9793ce3c35607b15012b4c7deca300963a7cc38ab440189ec81e2e7 \ |
|
| 176 |
- hypriot/armhf-hello-world:latest@sha256:b618ec0cc3acf683e8d77ad6c5ec81546cddde2036eda9a78f628effdeca74cd \ |
|
| 177 |
- hypriot/armhf-unshare:latest@sha256:8fede091760d2fb8b2d14cedffdd681c4575b02b1abeeb18dd79b754c62327db |
|
| 178 |
-# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) |
|
| 179 |
- |
|
| 180 |
-# Download man page generator |
|
| 181 |
-RUN set -x \ |
|
| 182 |
- && export GOPATH="$(mktemp -d)" \ |
|
| 183 |
- && git clone -b v1.0.4 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \ |
|
| 184 |
- && git clone -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \ |
|
| 185 |
- && go get -v -d github.com/cpuguy83/go-md2man \ |
|
| 186 |
- && go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \ |
|
| 187 |
- && rm -rf "$GOPATH" |
|
| 188 |
- |
|
| 189 |
-# Download toml validator |
|
| 190 |
-ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a |
|
| 191 |
-RUN set -x \ |
|
| 192 |
- && export GOPATH="$(mktemp -d)" \ |
|
| 193 |
- && git clone https://github.com/BurntSushi/toml.git "$GOPATH/src/github.com/BurntSushi/toml" \ |
|
| 194 |
- && (cd "$GOPATH/src/github.com/BurntSushi/toml" && git checkout -q "$TOMLV_COMMIT") \ |
|
| 195 |
- && go build -v -o /usr/local/bin/tomlv github.com/BurntSushi/toml/cmd/tomlv \ |
|
| 196 |
- && rm -rf "$GOPATH" |
|
| 197 |
- |
|
| 198 |
-# Build/install the tool for embedding resources in Windows binaries |
|
| 199 |
-ENV RSRC_COMMIT e48dbf1b7fc464a9e85fcec450dddf80816b76e0 |
|
| 200 |
-RUN set -x \ |
|
| 201 |
- && git clone https://github.com/akavel/rsrc.git /go/src/github.com/akavel/rsrc \ |
|
| 202 |
- && cd /go/src/github.com/akavel/rsrc \ |
|
| 203 |
- && git checkout -q $RSRC_COMMIT \ |
|
| 204 |
- && go install -v |
|
| 205 |
- |
|
| 206 |
-# Wrap all commands in the "docker-in-docker" script to allow nested containers |
|
| 207 |
-ENTRYPOINT ["hack/dind"] |
|
| 208 |
- |
|
| 209 |
-# Upload docker source |
|
| 210 |
-COPY . /go/src/github.com/docker/docker |
| 211 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,209 @@ |
| 0 |
+# This file describes the standard way to build Docker on ARMv7, using docker |
|
| 1 |
+# |
|
| 2 |
+# Usage: |
|
| 3 |
+# |
|
| 4 |
+# # Assemble the full dev environment. This is slow the first time. |
|
| 5 |
+# docker build -t docker -f Dockerfile.armhf . |
|
| 6 |
+# |
|
| 7 |
+# # Mount your source in an interactive container for quick testing: |
|
| 8 |
+# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash |
|
| 9 |
+# |
|
| 10 |
+# # Run the test suite: |
|
| 11 |
+# docker run --privileged docker hack/make.sh test |
|
| 12 |
+# |
|
| 13 |
+# # Publish a release: |
|
| 14 |
+# docker run --privileged \ |
|
| 15 |
+# -e AWS_S3_BUCKET=baz \ |
|
| 16 |
+# -e AWS_ACCESS_KEY=foo \ |
|
| 17 |
+# -e AWS_SECRET_KEY=bar \ |
|
| 18 |
+# -e GPG_PASSPHRASE=gloubiboulga \ |
|
| 19 |
+# docker hack/release.sh |
|
| 20 |
+# |
|
| 21 |
+# Note: AppArmor used to mess with privileged mode, but this is no longer |
|
| 22 |
+# the case. Therefore, you don't have to disable it anymore. |
|
| 23 |
+# |
|
| 24 |
+ |
|
| 25 |
+FROM ioft/armhf-ubuntu:14.04 |
|
| 26 |
+MAINTAINER Govinda Fichtner <govinda.fichtner@googlemail.com> (@_beagile_) |
|
| 27 |
+ |
|
| 28 |
+# Packaged dependencies |
|
| 29 |
+RUN apt-get update && apt-get install -y \ |
|
| 30 |
+ apparmor \ |
|
| 31 |
+ aufs-tools \ |
|
| 32 |
+ automake \ |
|
| 33 |
+ bash-completion \ |
|
| 34 |
+ btrfs-tools \ |
|
| 35 |
+ build-essential \ |
|
| 36 |
+ createrepo \ |
|
| 37 |
+ curl \ |
|
| 38 |
+ dpkg-sig \ |
|
| 39 |
+ git \ |
|
| 40 |
+ iptables \ |
|
| 41 |
+ jq \ |
|
| 42 |
+ libapparmor-dev \ |
|
| 43 |
+ libcap-dev \ |
|
| 44 |
+ libltdl-dev \ |
|
| 45 |
+ libsqlite3-dev \ |
|
| 46 |
+ libsystemd-journal-dev \ |
|
| 47 |
+ libtool \ |
|
| 48 |
+ mercurial \ |
|
| 49 |
+ pkg-config \ |
|
| 50 |
+ python-dev \ |
|
| 51 |
+ python-mock \ |
|
| 52 |
+ python-pip \ |
|
| 53 |
+ python-websocket \ |
|
| 54 |
+ s3cmd=1.1.0* \ |
|
| 55 |
+ xfsprogs \ |
|
| 56 |
+ tar \ |
|
| 57 |
+ --no-install-recommends |
|
| 58 |
+ |
|
| 59 |
+# Get lvm2 source for compiling statically |
|
| 60 |
+RUN git clone -b v2_02_103 https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 |
|
| 61 |
+# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags |
|
| 62 |
+ |
|
| 63 |
+# Compile and install lvm2 |
|
| 64 |
+RUN cd /usr/local/lvm2 \ |
|
| 65 |
+ && ./configure --enable-static_link \ |
|
| 66 |
+ && make device-mapper \ |
|
| 67 |
+ && make install_device-mapper |
|
| 68 |
+# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL |
|
| 69 |
+ |
|
| 70 |
+# Install Go |
|
| 71 |
+ENV GO_VERSION 1.4.3 |
|
| 72 |
+# TODO update GO_TOOLS_COMMIT below when this updates to 1.5+ |
|
| 73 |
+RUN curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/local -xz
|
|
| 74 |
+ENV PATH /go/bin:/usr/local/go/bin:$PATH |
|
| 75 |
+ENV GOPATH /go:/go/src/github.com/docker/docker/vendor |
|
| 76 |
+ |
|
| 77 |
+# we're building for armhf, which is ARMv7, so let's be explicit about that |
|
| 78 |
+ENV GOARM 7 |
|
| 79 |
+ |
|
| 80 |
+RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1 |
|
| 81 |
+ |
|
| 82 |
+# This has been commented out and kept as reference because we don't support compiling with older Go anymore. |
|
| 83 |
+# ENV GOFMT_VERSION 1.3.3 |
|
| 84 |
+# RUN curl -sSL https://storage.googleapis.com/golang/go${GOFMT_VERSION}.$(go env GOOS)-$(go env GOARCH).tar.gz | tar -C /go/bin -xz --strip-components=2 go/bin/gofmt
|
|
| 85 |
+ |
|
| 86 |
+# TODO update this sha when we upgrade to Go 1.5+ |
|
| 87 |
+ENV GO_TOOLS_COMMIT 069d2f3bcb68257b627205f0486d6cc69a231ff9 |
|
| 88 |
+# Grab Go's cover tool for dead-simple code coverage testing |
|
| 89 |
+# Grab Go's vet tool for examining go code to find suspicious constructs |
|
| 90 |
+# and help prevent errors that the compiler might not catch |
|
| 91 |
+RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ |
|
| 92 |
+ && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ |
|
| 93 |
+ && go install -v golang.org/x/tools/cmd/cover \ |
|
| 94 |
+ && go install -v golang.org/x/tools/cmd/vet |
|
| 95 |
+# Grab Go's lint tool |
|
| 96 |
+ENV GO_LINT_COMMIT f42f5c1c440621302702cb0741e9d2ca547ae80f |
|
| 97 |
+RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \ |
|
| 98 |
+ && (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \ |
|
| 99 |
+ && go install -v github.com/golang/lint/golint |
|
| 100 |
+ |
|
| 101 |
+# install seccomp |
|
| 102 |
+# this can be changed to the ubuntu package libseccomp-dev if dockerinit is removed, |
|
| 103 |
+# we need libseccomp.a (which the package does not provide) for dockerinit |
|
| 104 |
+ENV SECCOMP_VERSION v2.2.3 |
|
| 105 |
+RUN set -x \ |
|
| 106 |
+ && export SECCOMP_PATH=$(mktemp -d) \ |
|
| 107 |
+ && git clone https://github.com/seccomp/libseccomp.git "$SECCOMP_PATH" \ |
|
| 108 |
+ && ( \ |
|
| 109 |
+ cd "$SECCOMP_PATH" \ |
|
| 110 |
+ && git checkout "$SECCOMP_VERSION" \ |
|
| 111 |
+ && ./autogen.sh \ |
|
| 112 |
+ && ./configure --prefix=/usr \ |
|
| 113 |
+ && make \ |
|
| 114 |
+ && make install \ |
|
| 115 |
+ ) \ |
|
| 116 |
+ && rm -rf "$SECCOMP_PATH" |
|
| 117 |
+ |
|
| 118 |
+# Install registry |
|
| 119 |
+ENV REGISTRY_COMMIT ec87e9b6971d831f0eff752ddb54fb64693e51cd |
|
| 120 |
+RUN set -x \ |
|
| 121 |
+ && export GOPATH="$(mktemp -d)" \ |
|
| 122 |
+ && git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \ |
|
| 123 |
+ && (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \ |
|
| 124 |
+ && GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \ |
|
| 125 |
+ go build -o /usr/local/bin/registry-v2 github.com/docker/distribution/cmd/registry \ |
|
| 126 |
+ && rm -rf "$GOPATH" |
|
| 127 |
+ |
|
| 128 |
+# Install notary server |
|
| 129 |
+# commented Notary temporary as we are waiting for an update of jose2go: https://github.com/docker/notary/issues/239 |
|
| 130 |
+# |
|
| 131 |
+# ENV NOTARY_COMMIT 8e8122eb5528f621afcd4e2854c47302f17392f7 |
|
| 132 |
+# RUN set -x \ |
|
| 133 |
+# && export GOPATH="$(mktemp -d)" \ |
|
| 134 |
+# && git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \ |
|
| 135 |
+# && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_COMMIT") \ |
|
| 136 |
+# && GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \ |
|
| 137 |
+# go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \ |
|
| 138 |
+# && rm -rf "$GOPATH" |
|
| 139 |
+ |
|
| 140 |
+# Get the "docker-py" source so we can run their integration tests |
|
| 141 |
+ENV DOCKER_PY_COMMIT 139850f3f3b17357bab5ba3edfb745fb14043764 |
|
| 142 |
+RUN git clone https://github.com/docker/docker-py.git /docker-py \ |
|
| 143 |
+ && cd /docker-py \ |
|
| 144 |
+ && git checkout -q $DOCKER_PY_COMMIT |
|
| 145 |
+ |
|
| 146 |
+# Setup s3cmd config |
|
| 147 |
+RUN { \
|
|
| 148 |
+ echo '[default]'; \ |
|
| 149 |
+ echo 'access_key=$AWS_ACCESS_KEY'; \ |
|
| 150 |
+ echo 'secret_key=$AWS_SECRET_KEY'; \ |
|
| 151 |
+ } > ~/.s3cfg |
|
| 152 |
+ |
|
| 153 |
+# Set user.email so crosbymichael's in-container merge commits go smoothly |
|
| 154 |
+RUN git config --global user.email 'docker-dummy@example.com' |
|
| 155 |
+ |
|
| 156 |
+# Add an unprivileged user to be used for tests which need it |
|
| 157 |
+RUN groupadd -r docker |
|
| 158 |
+RUN useradd --create-home --gid docker unprivilegeduser |
|
| 159 |
+ |
|
| 160 |
+VOLUME /var/lib/docker |
|
| 161 |
+WORKDIR /go/src/github.com/docker/docker |
|
| 162 |
+ENV DOCKER_BUILDTAGS apparmor seccomp selinux |
|
| 163 |
+ |
|
| 164 |
+# Let us use a .bashrc file |
|
| 165 |
+RUN ln -sfv $PWD/.bashrc ~/.bashrc |
|
| 166 |
+ |
|
| 167 |
+# Register Docker's bash completion. |
|
| 168 |
+RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker |
|
| 169 |
+ |
|
| 170 |
+# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
|
| 171 |
+COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
|
| 172 |
+RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
|
| 173 |
+ hypriot/armhf-busybox:latest@sha256:b0fc94dac9793ce3c35607b15012b4c7deca300963a7cc38ab440189ec81e2e7 \ |
|
| 174 |
+ hypriot/armhf-hello-world:latest@sha256:b618ec0cc3acf683e8d77ad6c5ec81546cddde2036eda9a78f628effdeca74cd \ |
|
| 175 |
+ hypriot/armhf-unshare:latest@sha256:8fede091760d2fb8b2d14cedffdd681c4575b02b1abeeb18dd79b754c62327db |
|
| 176 |
+# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) |
|
| 177 |
+ |
|
| 178 |
+# Download man page generator |
|
| 179 |
+RUN set -x \ |
|
| 180 |
+ && export GOPATH="$(mktemp -d)" \ |
|
| 181 |
+ && git clone -b v1.0.4 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \ |
|
| 182 |
+ && git clone -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \ |
|
| 183 |
+ && go get -v -d github.com/cpuguy83/go-md2man \ |
|
| 184 |
+ && go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \ |
|
| 185 |
+ && rm -rf "$GOPATH" |
|
| 186 |
+ |
|
| 187 |
+# Download toml validator |
|
| 188 |
+ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a |
|
| 189 |
+RUN set -x \ |
|
| 190 |
+ && export GOPATH="$(mktemp -d)" \ |
|
| 191 |
+ && git clone https://github.com/BurntSushi/toml.git "$GOPATH/src/github.com/BurntSushi/toml" \ |
|
| 192 |
+ && (cd "$GOPATH/src/github.com/BurntSushi/toml" && git checkout -q "$TOMLV_COMMIT") \ |
|
| 193 |
+ && go build -v -o /usr/local/bin/tomlv github.com/BurntSushi/toml/cmd/tomlv \ |
|
| 194 |
+ && rm -rf "$GOPATH" |
|
| 195 |
+ |
|
| 196 |
+# Build/install the tool for embedding resources in Windows binaries |
|
| 197 |
+ENV RSRC_COMMIT e48dbf1b7fc464a9e85fcec450dddf80816b76e0 |
|
| 198 |
+RUN set -x \ |
|
| 199 |
+ && git clone https://github.com/akavel/rsrc.git /go/src/github.com/akavel/rsrc \ |
|
| 200 |
+ && cd /go/src/github.com/akavel/rsrc \ |
|
| 201 |
+ && git checkout -q $RSRC_COMMIT \ |
|
| 202 |
+ && go install -v |
|
| 203 |
+ |
|
| 204 |
+# Wrap all commands in the "docker-in-docker" script to allow nested containers |
|
| 205 |
+ENTRYPOINT ["hack/dind"] |
|
| 206 |
+ |
|
| 207 |
+# Upload docker source |
|
| 208 |
+COPY . /go/src/github.com/docker/docker |
| ... | ... |
@@ -6,7 +6,7 @@ DOCKER_ENGINE_OSARCH = $(shell docker version | grep 'OS/Arch' | tail -1 | cut - |
| 6 | 6 |
DOCKER_FILE = Dockerfile |
| 7 | 7 |
# switch to different Dockerfile for linux/arm |
| 8 | 8 |
ifeq ($(DOCKER_ENGINE_OSARCH),linux/arm) |
| 9 |
- DOCKER_FILE = Dockerfile.arm |
|
| 9 |
+ DOCKER_FILE = Dockerfile.armhf |
|
| 10 | 10 |
endif |
| 11 | 11 |
export DOCKER_FILE |
| 12 | 12 |
|