beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
moby/Dockerfile

264 lines
10 KiB
Text
Raw Normal View History

* Hack: standardized docker's build environment in a Dockerfile
2013-06-22 02:42:17 +00:00
# This file describes the standard way to build Docker, using docker
Add usage instructions to the Dockerfile. Build, test and release docker using docker.
2013-09-07 02:58:05 +00:00
#
# Usage:
#
# # Assemble the full dev environment. This is slow the first time.
# docker build -t docker .
#
Document using the Dockerfile for interactive dev/test cycles
2013-09-07 03:16:13 +00:00
# # Mount your source in an interactive container for quick testing:
update go import path and libcontainer Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-24 22:19:50 +00:00
# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash
Document using the Dockerfile for interactive dev/test cycles
2013-09-07 03:16:13 +00:00
#
Add usage instructions to the Dockerfile. Build, test and release docker using docker.
2013-09-07 02:58:05 +00:00
# # Run the test suite:
Update to double-dash everywhere These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there). Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-13 17:46:02 +00:00
# docker run --privileged docker hack/make.sh test
Add usage instructions to the Dockerfile. Build, test and release docker using docker.
2013-09-07 02:58:05 +00:00
#
# # Publish a release:
Update to double-dash everywhere These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there). Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-13 17:46:02 +00:00
# docker run --privileged \
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
2013-09-30 19:57:30 +00:00
# -e AWS_S3_BUCKET=baz \
# -e AWS_ACCESS_KEY=foo \
# -e AWS_SECRET_KEY=bar \
# -e GPG_PASSPHRASE=gloubiboulga \
# docker hack/release.sh
#
Carry of PR #13520 Removinig files Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-13 16:21:50 +00:00
# Note: AppArmor used to mess with privileged mode, but this is no longer
Refactor HostConfig and escape apparmor confinement
2013-10-31 21:58:43 +00:00
# the case. Therefore, you don't have to disable it anymore.
#
Add usage instructions to the Dockerfile. Build, test and release docker using docker.
2013-09-07 02:58:05 +00:00
Switch Dockerfile to debian:jessie Fixes broken-pipe issue when piping s3cmd to grep -q, by removing the -q flag and redirecting to /dev/null instead. Add net-tools for ifconfig, because some tests rely on ifconfig. Harmonize all Dockerfiles in this direction. Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-12 16:56:11 +00:00
FROM debian:jessie
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
2013-09-30 19:57:30 +00:00
update for mac Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-09 01:59:09 +00:00
# add zfs ppa
Add pgp.mit.edu fallback in Dockerfile Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-12 16:48:42 +00:00
RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61 \
|| apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61
Refactor multi-arch support (especially for new mostly-official multi-arch official images) See https://github.com/docker-library/official-images/blob/99433d2ca217bd9479169c93a20b6f6530f94856/README.md#architectures-other-than-amd64 for some context of where these images come from. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-05 05:50:15 +00:00
RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list
Implement Docker on ZFS Signed-off-by: Arthur Gautier <baloo@gandi.net> Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2014-09-03 14:26:19 +00:00
update for mac Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-09 01:59:09 +00:00
Allow specifying apt mirror in dockerfile Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-28 20:47:28 +00:00
# allow replacing httpredir mirror
ARG APT_MIRROR=httpredir.debian.org
RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
# Packaged dependencies
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
RUN apt-get update && apt-get install -y \
Add apparmor Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-10 02:22:19 +00:00
apparmor \
Fix release scripts Add some missing dependencies in the Dockerfile: - apt-utils for apt-ftparchive.conf - bsdmainutils for our use of the column command in hack/make/generate-index-listing We also ensure that the docker daemon is started before calling release-deb or release-rpm, since .detect-daemon-osarch, which is sourced in each of them, requires the daemon to be running. This commit also gets completely rid of s3cmd and fixes references to AWS_* environment variables (changing from AWS_ACCESS_KEY to AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to AWS_SECRET_ACCESS_KEY) in order to please awscli. Also AWS_DEFAULT_REGION is now important to specify, the default has been set to the region used by get.docker.com and test.docker.com. Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-25 14:54:36 +00:00
apt-utils \
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
aufs-tools \
Update Dockerfile to be based on 13.10 instead of 12.04 so that we can remove our s3cmd backports need, and so we can have the new linux-libc-dev dependency we need for compiling the btrfs driver without nasty APT hackery In addition, we've now hard-coded LXC version 0.8 compiled from source so that we can have the most stable dev environment possible. Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-27 22:34:46 +00:00
automake \
Enable bash completion in build environment Installs and configures bash completion for Docker. Note that bash completion still has to be initialized by a custom .bashrc file. Signed-off-by: Harald Albers <github@albersweb.de>
2015-03-29 12:42:48 +00:00
bash-completion \
Windows: Add file version information This change adds file version information to docker.exe and dockerd.exe by adding a Windows version resource with the windres tool. This change adds a dependency to binutils-mingw-w64 on Linux, but removes a dependency on rsrc. Most Windows build environments should already have windres if they have gcc (which is necessary to build dockerd). Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-23 22:11:08 +00:00
binutils-mingw-w64 \
Fix release scripts Add some missing dependencies in the Dockerfile: - apt-utils for apt-ftparchive.conf - bsdmainutils for our use of the column command in hack/make/generate-index-listing We also ensure that the docker daemon is started before calling release-deb or release-rpm, since .detect-daemon-osarch, which is sourced in each of them, requires the daemon to be running. This commit also gets completely rid of s3cmd and fixes references to AWS_* environment variables (changing from AWS_ACCESS_KEY to AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to AWS_SECRET_ACCESS_KEY) in order to please awscli. Also AWS_DEFAULT_REGION is now important to specify, the default has been set to the region used by get.docker.com and test.docker.com. Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-25 14:54:36 +00:00
bsdmainutils \
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs) This fixes compilation issues when btrfs.h isn't available (because we just need the relevant structs, which for userspace programs are supposed to come from btrfs-progs instead of the kernel headers). Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-02 04:40:51 +00:00
btrfs-tools \
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
build-essential \
Use clang 3.5 over 3.8 the llvm apt repo was removed and finding the exact rev of the llvm toolchain that worked perfecting in our dockerfile is a problem. We looked at the reasons why we were using this version of clang and it appears to be this compiler warning. `was built for newer OSX version (10.11) than being linked (10.6)` When you look at the dockerfile this makes sense. ``` ENV OSX_SDK MacOSX10.11.sdk ENV OSX_CROSS_COMMIT 8aa9b71a394905e6c5f4b59e2b97b87a004658a4 RUN set -x \ && export OSXCROSS_PATH="/osxcross" \ && git clone https://github.com/tpoechtrager/osxcross.git $OSXCROSS_PATH \ && ( cd $OSXCROSS_PATH && git checkout -q $OSX_CROSS_COMMIT) \ && curl -sSL https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz -o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" \ && UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh ENV PATH /osxcross/target/bin:$PATH ``` We are basically using the 10.11 sdk but linking to 10.6 as the min version so this warning should be expected. Also the docs on the osxcross project require clan 3.2+, not 3.8. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-31 23:45:42 +00:00
clang \
Add release-deb & release-rpm scripts. These will create the apt & yum repos for the deb/rpms generated by build-deb and build-rpm. Adds sign-repo script which signs the repo metadata with a gpg key. Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-02 00:21:09 +00:00
createrepo \
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
curl \
dpkg-sig \
make windows cross compile static daemon work Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-10 19:51:54 +00:00
gcc-mingw-w64 \
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
git \
iptables \
update download-frozen-image.sh to v2 registry Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-31 17:06:22 +00:00
jq \
Update Dockerfile to be based on 13.10 instead of 12.04 so that we can remove our s3cmd backports need, and so we can have the new linux-libc-dev dependency we need for compiling the btrfs driver without nasty APT hackery In addition, we've now hard-coded LXC version 0.8 compiled from source so that we can have the most stable dev environment possible. Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-27 22:34:46 +00:00
libapparmor-dev \
libcap-dev \
add buildtag pkcs11 to experimental Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-31 01:14:10 +00:00
libltdl-dev \
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
libsqlite3-dev \
Add log reading to the journald log driver If a logdriver doesn't register a callback function to validate log options, it won't be usable. Fix the journald driver by adding a dummy validator. Teach the client and the daemon's "logs" logic that the server can also supply "logs" data via the "journald" driver. Update documentation and tests that depend on error messages. Add support for reading log data from the systemd journal to the journald log driver. The internal logic uses a goroutine to scan the journal for matching entries after any specified cutoff time, formats the messages from those entries as JSONLog messages, and stuffs the results down a pipe whose reading end we hand back to the caller. If we are missing any of the 'linux', 'cgo', or 'journald' build tags, however, we don't implement a reader, so the 'logs' endpoint will still return an error. Make the necessary changes to the build setup to ensure that support for reading container logs from the systemd journal is built. Rename the Jmap member of the journald logdriver's struct to "vars" to make it non-public, and to make it easier to tell that it's just there to hold additional variable values that we want journald to record along with log data that we're sending to it. In the client, don't assume that we know which logdrivers the server implements, and remove the check that looks at the server. It's redundant because the server already knows, and the check also makes using older clients with newer servers (which may have new logdrivers in them) unnecessarily hard. When we try to "logs" and have to report that the container's logdriver doesn't support reading, send the error message through the might-be-a-multiplexer so that clients which are expecting multiplexed data will be able to properly display the error, instead of tripping over the data and printing a less helpful "Unrecognized input header" error. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2015-07-23 15:02:56 +00:00
libsystemd-journal-dev \
dockerfile update for seccomp Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-15 02:01:24 +00:00
libtool \
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
mercurial \
Switch Dockerfile to debian:jessie Fixes broken-pipe issue when piping s3cmd to grep -q, by removing the -q flag and redirecting to /dev/null instead. Add net-tools for ifconfig, because some tests rely on ifconfig. Harmonize all Dockerfiles in this direction. Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-12 16:56:11 +00:00
net-tools \
Add log reading to the journald log driver If a logdriver doesn't register a callback function to validate log options, it won't be usable. Fix the journald driver by adding a dummy validator. Teach the client and the daemon's "logs" logic that the server can also supply "logs" data via the "journald" driver. Update documentation and tests that depend on error messages. Add support for reading log data from the systemd journal to the journald log driver. The internal logic uses a goroutine to scan the journal for matching entries after any specified cutoff time, formats the messages from those entries as JSONLog messages, and stuffs the results down a pipe whose reading end we hand back to the caller. If we are missing any of the 'linux', 'cgo', or 'journald' build tags, however, we don't implement a reader, so the 'logs' endpoint will still return an error. Make the necessary changes to the build setup to ensure that support for reading container logs from the systemd journal is built. Rename the Jmap member of the journald logdriver's struct to "vars" to make it non-public, and to make it easier to tell that it's just there to hold additional variable values that we want journald to record along with log data that we're sending to it. In the client, don't assume that we know which logdrivers the server implements, and remove the check that looks at the server. It's redundant because the server already knows, and the check also makes using older clients with newer servers (which may have new logdrivers in them) unnecessarily hard. When we try to "logs" and have to report that the container's logdriver doesn't support reading, send the error message through the might-be-a-multiplexer so that clients which are expecting multiplexed data will be able to properly display the error, instead of tripping over the data and printing a less helpful "Unrecognized input header" error. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2015-07-23 15:02:56 +00:00
pkg-config \
Dockerfile: add python-dev to fix Python.h errors Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-11-22 10:32:10 +00:00
python-dev \
Add docker-py integration tests aginst the docker daemon This clones and run the integration tests for docker-py master as part of the integration tests created on master. docker-py hits the api directly and should be a good way to identify regressions in the api. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-15 19:44:15 +00:00
python-mock \
python-pip \
Tweak test-docker-py feature - move docker/docker-py clone to the Dockerfile - put "integration test daemon startup" code in a separate file for both scripts to source - add new test-docker-py Makefile target - include "python-websocket" package in Dockerfile for running the tests Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-19 07:20:59 +00:00
python-websocket \
Implement Docker on ZFS Signed-off-by: Arthur Gautier <baloo@gandi.net> Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2014-09-03 14:26:19 +00:00
ubuntu-zfs \
Include xfsprogs in build environment. devmapper uses xfs by default now. So include xfsprogs in build environment. Also update docs to reflect the new default. Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2015-11-11 22:29:02 +00:00
xfsprogs \
Implement Docker on ZFS Signed-off-by: Arthur Gautier <baloo@gandi.net> Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2014-09-03 14:26:19 +00:00
libzfs-dev \
This patch adds --tmpfs as a option for mounting tmpfs on directories It will Tar up contents of child directory onto tmpfs if mounted over This patch will use the new PreMount and PostMount hooks to "tar" up the contents of the base image on top of tmpfs mount points. Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-12-01 18:39:34 +00:00
tar \
Change the windows .tgz to a .zip file Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-31 16:27:50 +00:00
zip \
update for mac Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-09 01:59:09 +00:00
--no-install-recommends \
Use clang 3.5 over 3.8 the llvm apt repo was removed and finding the exact rev of the llvm toolchain that worked perfecting in our dockerfile is a problem. We looked at the reasons why we were using this version of clang and it appears to be this compiler warning. `was built for newer OSX version (10.11) than being linked (10.6)` When you look at the dockerfile this makes sense. ``` ENV OSX_SDK MacOSX10.11.sdk ENV OSX_CROSS_COMMIT 8aa9b71a394905e6c5f4b59e2b97b87a004658a4 RUN set -x \ && export OSXCROSS_PATH="/osxcross" \ && git clone https://github.com/tpoechtrager/osxcross.git $OSXCROSS_PATH \ && ( cd $OSXCROSS_PATH && git checkout -q $OSX_CROSS_COMMIT) \ && curl -sSL https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz -o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" \ && UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh ENV PATH /osxcross/target/bin:$PATH ``` We are basically using the 10.11 sdk but linking to 10.6 as the min version so this warning should be expected. Also the docs on the osxcross project require clan 3.2+, not 3.8. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-31 23:45:42 +00:00
&& pip install awscli==1.10.15
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
# Get lvm2 source for compiling statically
Refactor multi-arch support (especially for new mostly-official multi-arch official images) See https://github.com/docker-library/official-images/blob/99433d2ca217bd9479169c93a20b6f6530f94856/README.md#architectures-other-than-amd64 for some context of where these images come from. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-05 05:50:15 +00:00
ENV LVM2_VERSION 2.02.103
RUN mkdir -p /usr/local/lvm2 \
&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
| tar -xzC /usr/local/lvm2 --strip-components=1
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
# Compile and install lvm2
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
RUN cd /usr/local/lvm2 \
Refactor multi-arch support (especially for new mostly-official multi-arch official images) See https://github.com/docker-library/official-images/blob/99433d2ca217bd9479169c93a20b6f6530f94856/README.md#architectures-other-than-amd64 for some context of where these images come from. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-05 05:50:15 +00:00
&& ./configure \
--build="$(gcc -print-multiarch)" \
--enable-static_link \
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
&& make device-mapper \
&& make install_device-mapper
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
2013-09-30 19:57:30 +00:00
Move long compilations before Go install in Dockerfile Now we can avoid long compilations on Go update. Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-20 06:42:05 +00:00
# Configure the container for OSX cross compilation
ENV OSX_SDK MacOSX10.11.sdk
Pin tpoechtrager/osxcross commit Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-27 20:00:12 +00:00
ENV OSX_CROSS_COMMIT 8aa9b71a394905e6c5f4b59e2b97b87a004658a4
Move long compilations before Go install in Dockerfile Now we can avoid long compilations on Go update. Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-20 06:42:05 +00:00
RUN set -x \
&& export OSXCROSS_PATH="/osxcross" \
Pin tpoechtrager/osxcross commit Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-27 20:00:12 +00:00
&& git clone https://github.com/tpoechtrager/osxcross.git $OSXCROSS_PATH \
&& ( cd $OSXCROSS_PATH && git checkout -q $OSX_CROSS_COMMIT) \
move hardware signing out of experimental, remove dependencies to yubico-piv-tool Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-28 18:36:20 +00:00
&& curl -sSL https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz -o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" \
Move long compilations before Go install in Dockerfile Now we can avoid long compilations on Go update. Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-20 06:42:05 +00:00
&& UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh
ENV PATH /osxcross/target/bin:$PATH
update comment Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-02 17:56:29 +00:00
# install seccomp: the version shipped in trusty is too old
Bump the seccomp versions to pull in fixes and new commits enabling s390 and ppc64le function Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2016-05-24 20:39:52 +00:00
ENV SECCOMP_VERSION 2.3.1
Move long compilations before Go install in Dockerfile Now we can avoid long compilations on Go update. Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-20 06:42:05 +00:00
RUN set -x \
&& export SECCOMP_PATH="$(mktemp -d)" \
&& curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
| tar -xzC "$SECCOMP_PATH" --strip-components=1 \
&& ( \
cd "$SECCOMP_PATH" \
&& ./configure --prefix=/usr/local \
&& make \
&& make install \
&& ldconfig \
) \
&& rm -rf "$SECCOMP_PATH"
Add links for container relationships and introspection
2013-10-05 02:25:15 +00:00
# Install Go
Add note in dockerfile about go version Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-14 20:20:19 +00:00
# IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
*: purge dockerinit from source code dockerinit has been around for a very long time. It was originally used as a way for us to do configuration for LXC containers once the container had started. LXC is no longer supported, and /.dockerinit has been dead code for quite a while. This removes all code and references in code to dockerinit. Signed-off-by: Aleksa Sarai <asarai@suse.com>
2016-01-20 11:53:54 +00:00
# will need updating, to avoid errors. Ping #docker-maintainers on IRC
Add note in dockerfile about go version Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-14 20:20:19 +00:00
# with a heads-up.
Upgrade to golang 1.6.2 Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-19 19:13:35 +00:00
ENV GO_VERSION 1.6.2
Refactor multi-arch support (especially for new mostly-official multi-arch official images) See https://github.com/docker-library/official-images/blob/99433d2ca217bd9479169c93a20b6f6530f94856/README.md#architectures-other-than-amd64 for some context of where these images come from. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-05 05:50:15 +00:00
RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
| tar -xzC /usr/local
Workaround Windows bug discovered with Go security fix For context: https://github.com/golang/go/issues/15286 This commit downloads go1.5.3 in addition to go1.5.4 in order to workaround the issue. It is not expected to do a Docker release without a proper fix, however this should help unblock Docker development on Windows TP5. Signed-off-by: Tibor Vass <tibor@docker.com>
2016-04-15 21:34:24 +00:00
Refactor Dockerfile version number usage This refactors version number usage for several of our "download/install this exact version" bits so we have an easier time replacing the version numbers in Jenkins. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-09 06:07:15 +00:00
ENV PATH /go/bin:/usr/local/go/bin:$PATH
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
2013-12-19 06:06:14 +00:00
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-25 03:40:41 +00:00
# Compile Go for cross compilation
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
ENV DOCKER_CROSSPLATFORMS \
Update DOCKER_CROSSPLATFORMS to be more readable Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-08 15:42:47 +00:00
linux/386 linux/arm \
Don't build Darwin 32-bit binaries The last 32-bit OS X computers were built in 2006, so we probably don't need these anymore. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-21 23:08:18 +00:00
darwin/amd64 \
Revert "Remove windows from the list of supported platforms" Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-09 22:19:08 +00:00
freebsd/amd64 freebsd/386 freebsd/arm \
windows/amd64 windows/386
Windows should not be officially released. Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-11-26 18:46:00 +00:00
Removed go1.3.3 support Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
2015-04-20 20:06:17 +00:00
# This has been commented out and kept as reference because we don't support compiling with older Go anymore.
# ENV GOFMT_VERSION 1.3.3
# 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
Add "gofmt" from Go 1.3.3 Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-09 06:09:06 +00:00
Update linting tools Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 16:32:49 +00:00
ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts
2013-12-09 03:20:55 +00:00
# Grab Go's cover tool for dead-simple code coverage testing
Adds validate-vet script resolves #11970 Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-04-01 04:48:03 +00:00
# Grab Go's vet tool for examining go code to find suspicious constructs
# and help prevent errors that the compiler might not catch
change go tools to use certain commit Signed-off-by: Jessica Frazelle <jess@docker.com>
2015-04-14 02:26:04 +00:00
RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \
&& (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \
&& go install -v golang.org/x/tools/cmd/cover \
&& go install -v golang.org/x/tools/cmd/vet
Add golint to the development toolbox Add golint to the Dockerfile, and a `validate-lint` task to the Makefile. Currently, the linter will process a harcoded list of packages that will expand as we fix more warnings. Eventually, the linter should process all subpackages of the repo (excluding vendored code). Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-21 01:32:55 +00:00
# Grab Go's lint tool
Update linting tools Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 16:32:49 +00:00
ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456
Add golint to the development toolbox Add golint to the Dockerfile, and a `validate-lint` task to the Makefile. Currently, the linter will process a harcoded list of packages that will expand as we fix more warnings. Eventually, the linter should process all subpackages of the repo (excluding vendored code). Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-21 01:32:55 +00:00
RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \
&& (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \
&& go install -v github.com/golang/lint/golint
Adds validate-vet script resolves #11970 Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-04-01 04:48:03 +00:00
Build a pre-schema2 registry to test schema1 push/pull Add DockerSchema1RegistrySuite which uses this registry, and make applicable integration tests run as part of this suite. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-18 23:06:23 +00:00
# Install two versions of the registry. The first is an older version that
# only supports schema1 manifests. The second is a newer version that supports
# both. This allows integration-cli tests to cover push/pull with both schema1
# and schema2 manifests.
ENV REGISTRY_COMMIT_SCHEMA1 ec87e9b6971d831f0eff752ddb54fb64693e51cd
Vendor updated docker/distribution package Fixes #19400 Note that this introduces an incompatibility with Docker 1.10-rc1, because the media type used for schema1 manifests has been corrected in the upstream distribution code. Docker 1.10-rc1 won't be able to pull old manifests from Registry 2.3-rc0 and up, but because of this vendor update, Docker 1.10-rc2 won't have this problem. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-19 21:28:51 +00:00
ENV REGISTRY_COMMIT 47a064d4195a9b56133891bbb13620c3ac83a827
Update Dockerfile to use Godeps for distribution Update our "registry" install to use the included Godeps libraries so that it doesn't require anything from our current source (hence moving it up for better caching too) Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-21 03:40:19 +00:00
RUN set -x \
Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-05 22:20:04 +00:00
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \
&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \
&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
go build -o /usr/local/bin/registry-v2 github.com/docker/distribution/cmd/registry \
Build a pre-schema2 registry to test schema1 push/pull Add DockerSchema1RegistrySuite which uses this registry, and make applicable integration tests run as part of this suite. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-18 23:06:23 +00:00
&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1") \
&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
go build -o /usr/local/bin/registry-v2-schema1 github.com/docker/distribution/cmd/registry \
Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-05 22:20:04 +00:00
&& rm -rf "$GOPATH"
Update Dockerfile to use Godeps for distribution Update our "registry" install to use the included Godeps libraries so that it doesn't require anything from our current source (hence moving it up for better caching too) Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-21 03:40:19 +00:00
Dockerfile.s390x: Build correct registries and notary client Sync with other Dockerfiles: 1) Adjust REGISTRY_COMMIT 2) Add old shema1 registry 3) Install notary client This fixes the following testcases: DockerSchema1RegistrySuite: - SetUpTest DockerTrustSuite: - TestTrustedBuildTagFromReleasesRole - TestTrustedBuildTagIgnoresOtherDelegationRoles - TestTrustedPullReadsFromReleasesRole - TestTrustedPullIgnoresOtherDelegationRoles - TestTrustedPushWithReleasesDelegationOnly - TestTrustedPushSignsAllFirstLevelRolesWeHaveKeysFor - TestTrustedPushSignsForRolesWithKeysAndValidPaths - TestTrustedPushDoesntSignTargetsIfDelegationsExist DockerRegistrySuite: - TestPullManifestList - TestCrossRepositoryLayerPush DockerHubPullSuite: - TestPullAllTagsFromCentralRegistry v2: Sync comments on all architectures Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-04-29 08:59:19 +00:00
# Install notary and notary-server
Bump notary version up to 0.3.0 and re-vendor. Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-11 22:25:05 +00:00
ENV NOTARY_VERSION v0.3.0
Add integration cli trust tests Added notary server to docker base image. Created trust suite which runs trust server for running trusted commands. Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-20 05:56:10 +00:00
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
update tests and error messages, revendor notary with tag Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-01-08 02:43:01 +00:00
&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
Downgrade to Go 1.5.3. To not hit the issue with the request Host header. Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-24 22:41:34 +00:00
&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
Add integration cli trust tests Added notary server to docker base image. Created trust suite which runs trust server for running trusted commands. Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-20 05:56:10 +00:00
go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
Downgrade to Go 1.5.3. To not hit the issue with the request Host header. Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-24 22:41:34 +00:00
&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
Add an integration test for docker being able to push to a repo with delegations. Signed-off-by: cyli <cyli@twistedmatrix.com>
2015-12-24 00:34:46 +00:00
go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary \
Add integration cli trust tests Added notary server to docker base image. Created trust suite which runs trust server for running trusted commands. Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-20 05:56:10 +00:00
&& rm -rf "$GOPATH"
Tweak test-docker-py feature - move docker/docker-py clone to the Dockerfile - put "integration test daemon startup" code in a separate file for both scripts to source - add new test-docker-py Makefile target - include "python-websocket" package in Dockerfile for running the tests Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-19 07:20:59 +00:00
# Get the "docker-py" source so we can run their integration tests
vendor docker-py 7befe694bd21e3c54bb1d7825270ea4bd6864c13 Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-03-15 03:12:09 +00:00
ENV DOCKER_PY_COMMIT 7befe694bd21e3c54bb1d7825270ea4bd6864c13
Switch docker-py clone to use an explicit commit for natural cache-busting Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-13 19:34:55 +00:00
RUN git clone https://github.com/docker/docker-py.git /docker-py \
&& cd /docker-py \
docker-py: upgrade and fix test script Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-28 16:56:50 +00:00
&& git checkout -q $DOCKER_PY_COMMIT \
&& pip install -r test-requirements.txt
Tweak test-docker-py feature - move docker/docker-py clone to the Dockerfile - put "integration test daemon startup" code in a separate file for both scripts to source - add new test-docker-py Makefile target - include "python-websocket" package in Dockerfile for running the tests Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-19 07:20:59 +00:00
Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-29 20:13:32 +00:00
# Set user.email so crosbymichael's in-container merge commits go smoothly
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
RUN git config --global user.email 'docker-dummy@example.com'
Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-29 20:13:32 +00:00
add unprivilegeduser via the Dockerfile This changes the test TestBuildWithInaccessibleFilesInContext to not add the user 'unprivilegeduser' and add it via the Dockerfile instead. Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-19 20:55:28 +00:00
# Add an unprivileged user to be used for tests which need it
Simplify "adduser" in the Dockerfile to use the more scripting-friendly "useradd" Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-23 20:29:31 +00:00
RUN groupadd -r docker
RUN useradd --create-home --gid docker unprivilegeduser
add unprivilegeduser via the Dockerfile This changes the test TestBuildWithInaccessibleFilesInContext to not add the user 'unprivilegeduser' and add it via the Dockerfile instead. Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-19 20:55:28 +00:00
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
VOLUME /var/lib/docker
WORKDIR /go/src/github.com/docker/docker
move hardware signing out of experimental, remove dependencies to yubico-piv-tool Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-28 18:36:20 +00:00
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
Add support for an optional ".bashrc" file If `.bashrc` exists at the root of the source tree, it will be used as the `~/.bashrc` inside the container. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-02 17:33:26 +00:00
# Let us use a .bashrc file
RUN ln -sfv $PWD/.bashrc ~/.bashrc
Enable bash completion in build environment Installs and configures bash completion for Docker. Note that bash completion still has to be initialized by a custom .bashrc file. Signed-off-by: Harald Albers <github@albersweb.de>
2015-03-29 12:42:48 +00:00
# Register Docker's bash completion.
RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker
Refactor busybox downloading as generic "frozen-images" This makes it much simpler to add new "frozen" images -- simply add them to the `Dockerfile` and in `hack/make/.ensure-frozen-images` and you're off to the races. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-07 01:12:41 +00:00
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
update download-frozen-image.sh to v2 registry Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-31 17:06:22 +00:00
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run). Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-14 21:51:30 +00:00
buildpack-deps:jessie@sha256:25785f89240fbcdd8a74bdaf30dd5599a9523882c6dfc567f2e9ef7cf6f79db6 \
Refactor multi-arch support (especially for new mostly-official multi-arch official images) See https://github.com/docker-library/official-images/blob/99433d2ca217bd9479169c93a20b6f6530f94856/README.md#architectures-other-than-amd64 for some context of where these images come from. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-05 05:50:15 +00:00
busybox:latest@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0 \
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run). Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-14 21:51:30 +00:00
debian:jessie@sha256:f968f10b4b523737e253a97eac59b0d1420b5c19b69928d35801a6373ffe330e \
cleanup jess/unshare image Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-30 17:49:10 +00:00
hello-world:latest@sha256:8be990ef2aeb16dbcb9271ddfe2610fa6658d13f6dfb8bc72074cc1ca36966a7
Refactor busybox downloading as generic "frozen-images" This makes it much simpler to add new "frozen" images -- simply add them to the `Dockerfile` and in `hack/make/.ensure-frozen-images` and you're off to the races. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-07 01:12:41 +00:00
# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
Download busybox from the Hub instead of GitHub This downloads a specific image ID of `busybox:latest` from the Hub directly (within the `Dockerfile`, ready for `docker load`) instead of grabbing the source from GitHub and doing a `docker build` at daemon start time. This ensures the test suite runs more consistently. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-28 05:53:36 +00:00
Dockerfile: download go libraries before copy vendor When ever something vendor/ changes the go dependencies have to downloaded again, which requires internet access and there for is potential slow. COPY and go install is much faster, while the git urls does not change not this often. Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-21 09:33:52 +00:00
# Download man page generator
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
RUN set -x \
Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-05 22:20:04 +00:00
&& export GOPATH="$(mktemp -d)" \
update go-md2man to v1.0.5 Due to the issue of go-md2man, a numbered list in `man docker login` was not rendered correctly. https://github.com/cpuguy83/go-md2man/commit/a8f937e11314ca0b085aa7a7a5526695e3ca5b49 Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> (cherry picked from commit cfe16e0d5b4bb7d1d194553f2a82cc1879d60e6b)
2016-06-23 01:57:00 +00:00
&& git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \
Refactor multi-arch support (especially for new mostly-official multi-arch official images) See https://github.com/docker-library/official-images/blob/99433d2ca217bd9479169c93a20b6f6530f94856/README.md#architectures-other-than-amd64 for some context of where these images come from. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-05 05:50:15 +00:00
&& git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \
Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-05 22:20:04 +00:00
&& go get -v -d github.com/cpuguy83/go-md2man \
&& go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \
&& rm -rf "$GOPATH"
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
2013-09-30 19:57:30 +00:00
Dockerfile: download go libraries before copy vendor When ever something vendor/ changes the go dependencies have to downloaded again, which requires internet access and there for is potential slow. COPY and go install is much faster, while the git urls does not change not this often. Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-21 09:33:52 +00:00
# Download toml validator
fix tomlv because it doesn't read from stdin Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
2015-02-18 07:57:44 +00:00
ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
RUN set -x \
Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-05 22:20:04 +00:00
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/BurntSushi/toml.git "$GOPATH/src/github.com/BurntSushi/toml" \
&& (cd "$GOPATH/src/github.com/BurntSushi/toml" && git checkout -q "$TOMLV_COMMIT") \
&& go build -v -o /usr/local/bin/tomlv github.com/BurntSushi/toml/cmd/tomlv \
&& rm -rf "$GOPATH"
Validate toml Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
2015-01-30 19:45:02 +00:00
Replace execdrivers with containerd implementation Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-03-18 18:50:19 +00:00
# Install runc
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28 Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> (cherry picked from commit b675124cf5fc96a6c329b5580ef60304089270c6)
2016-06-15 21:57:34 +00:00
ENV RUNC_COMMIT cc29e3dded8e27ba8f65738f40d251c885030a28
Replace execdrivers with containerd implementation Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-03-18 18:50:19 +00:00
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28 Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> (cherry picked from commit b675124cf5fc96a6c329b5580ef60304089270c6)
2016-06-15 21:57:34 +00:00
&& git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
Replace execdrivers with containerd implementation Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-03-18 18:50:19 +00:00
&& cd "$GOPATH/src/github.com/opencontainers/runc" \
&& git checkout -q "$RUNC_COMMIT" \
Add `docker-` prefix to runc and containerd binaries Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-23 00:55:47 +00:00
&& make static BUILDTAGS="seccomp apparmor selinux" \
Remove template code for runc and containerd Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-04-15 04:45:35 +00:00
&& cp runc /usr/local/bin/docker-runc \
&& rm -rf "$GOPATH"
Replace execdrivers with containerd implementation Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-03-18 18:50:19 +00:00
# Install containerd
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> (cherry picked from commit 2685c82c2e1e75c1f7b39e8cb6e3d5acf258654d)
2016-07-01 18:45:19 +00:00
ENV CONTAINERD_COMMIT 1b3a81545ca79456086dc2aa424357be98b962ee
Replace execdrivers with containerd implementation Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-03-18 18:50:19 +00:00
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
Use https for `git clone` in build Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-29 07:35:42 +00:00
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Replace execdrivers with containerd implementation Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-03-18 18:50:19 +00:00
&& cd "$GOPATH/src/github.com/docker/containerd" \
&& git checkout -q "$CONTAINERD_COMMIT" \
Add `docker-` prefix to runc and containerd binaries Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-23 00:55:47 +00:00
&& make static \
&& cp bin/containerd /usr/local/bin/docker-containerd \
&& cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \
Remove template code for runc and containerd Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-04-15 04:45:35 +00:00
&& cp bin/ctr /usr/local/bin/docker-containerd-ctr \
&& rm -rf "$GOPATH"
Replace execdrivers with containerd implementation Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-03-18 18:50:19 +00:00
Adapt Dockerfile to run docker tests inside docker
2013-09-07 02:19:03 +00:00
# Wrap all commands in the "docker-in-docker" script to allow nested containers
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
ENTRYPOINT ["hack/dind"]
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
2013-09-30 19:57:30 +00:00
Hack: improve the Dockerfile for an easier development workflow. Build dev container once, run a shell with source mount-binded, run tests as you edit. LIKE A BOSS.
2013-09-07 03:14:03 +00:00
# Upload docker source
Adjust Dockerfile style to be more consistent Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 07:12:27 +00:00
COPY . /go/src/github.com/docker/docker
Reference in a new issue Copy permalink