kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity
moby--moby/Dockerfile

199 lines
7.3 KiB
Docker
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:
Remove test-integration-cli and references to it. Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-17 00:18:44 +00:00
# docker run -e DOCKER_GITCOMMIT=foo --privileged docker hack/make.sh test-unit test-integration test-docker-py
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
Update Dockerfiles to use Debian stretch The main gain here is that they all use exactly the same distro; previously arm64 was using Ubuntu Xenial because Debian jessie was too old. Does not seem that we can change any of the downloaded dependencies still, as eg libseccomp is still not the version we are using. Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-01 13:26:13 +00:00
FROM debian:stretch
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
2013-09-30 19:57:30 +00:00
allow replacing httpredir or deb mirror in jessie Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-11-20 22:14:51 +00:00
# allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org
RUN sed -ri "s/(httpredir|deb).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 \
Replace grimes with tini There is no reason to duplicate efforts and tini is well built and better than grimes. It is a much stronger option for the default init and @krallin has done a great job maintaining it and helping make changes so that it will work with Docker. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-11-03 16:47:50 +00:00
cmake \
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 \
Add vim to Dockerfile Why? Most of the time I end up needing an editor when in `make shell`. Spent much time doing `apt-get update && apt-get install vim`. Since we're already installing vim-common anyway... Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-17 21:00:59 +00:00
less \
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 \
devmapper gd: disable for static build Static build with devmapper is impossible now since libudev is required and no static version of libudev is available (as static libraries are not supported by systemd which udev is part of). This should not hurt anyone as "[t]he primary user of static builds is the Editions, and docker in docker via the containers, and none of those use device mapper". Also, since the need for static libdevmapper is gone, there is no need to self-compile libdevmapper -- let's use the one from Debian Stretch. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-08-18 09:48:55 +00:00
libdevmapper-dev \
CRIU needs a newer version to work with the updates pulled in by containerd 1.0 Signed-off-by: Ross Boucher <rboucher@gmail.com>
2017-12-04 22:45:04 +00:00
libnet-dev \
Initial implementation of containerd Checkpoint API. Signed-off-by: boucher <rboucher@gmail.com>
2016-05-12 14:52:00 +00:00
libnl-3-dev \
libprotobuf-c0-dev \
Updating the DockerFile for build failure, when make build is done, fixes #27035 - What I did While building docker from source, to get the dependencies installed had done make build, then had got this error. - How I did it In the DockerFIle, instead using space a tab was put, which when was done make build the next line was getting combined and was unable to install the package. image image Refer the below Hex View of the earlier file. image - How to verify it After fixing, changing tab to space, built from source to install dependencies and was success - Description for the changelog Fixing Issue #27035 Signed-off-by: Rojin George itsmerojin@gmail.com Signed-off-by: rojingeorge <itsmerojin@gmail.com>
2016-09-29 17:58:24 +00:00
libprotobuf-dev \
Dockerfile: use seccomp provided by stretch Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-09-25 10:03:37 +00:00
libseccomp-dev \
Update Dockerfiles to use Debian stretch The main gain here is that they all use exactly the same distro; previously arm64 was using Ubuntu Xenial because Debian jessie was too old. Does not seem that we can change any of the downloaded dependencies still, as eg libseccomp is still not the version we are using. Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-01 13:26:13 +00:00
libsystemd-dev \
dockerfile update for seccomp Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-15 02:01:24 +00:00
libtool \
Update Dockerfiles to use Debian stretch The main gain here is that they all use exactly the same distro; previously arm64 was using Ubuntu Xenial because Debian jessie was too old. Does not seem that we can change any of the downloaded dependencies still, as eg libseccomp is still not the version we are using. Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-01 13:26:13 +00:00
libudev-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
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 \
Make image (layer) downloads faster by using pigz The Golang built-in gzip library is serialized, and fairly slow at decompressing. It also only decompresses on demand, versus pipelining decompression. This change switches to using the pigz external command for gzip decompression, as opposed to using the built-in golang one. This code is not vendored, but will be used if it autodetected as part of the OS. This also switches to using context, versus a manually managed channel to manage cancellations, and synchronization. There is a little bit of weirdness around manually having to cancel in the error cases. Signed-off-by: Sargun Dhillon <sargun@sargun.me>
2018-01-16 18:49:18 +00:00
pigz \
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 \
Initial implementation of containerd Checkpoint API. Signed-off-by: boucher <rboucher@gmail.com>
2016-05-12 14:52:00 +00:00
protobuf-compiler \
protobuf-c-compiler \
Dockerfiles: fix test-docker-py Presumably after switch to debian-stretch as a base, the following errors happens in Jenkins: 10:48:03 ---> Making bundle: test-docker-py (in bundles/17.06.0-dev/test-docker-py) 10:48:03 ---> Making bundle: .integration-daemon-start (in bundles/17.06.0-dev/test-docker-py) 10:48:03 Using test binary docker 10:48:03 # DOCKER_EXPERIMENTAL is set: starting daemon with experimental features enabled! 10:48:03 /etc/init.d/apparmor: 130: /etc/init.d/apparmor: systemd-detect-virt: not found 10:48:03 Starting AppArmor profiles:Warning from stdin (line 1): /sbin/apparmor_parser: cannot use or update cache, disable, or force-complain via stdin 10:48:03 Warning failed to create cache: (null) 10:48:03 . 10:48:03 INFO: Waiting for daemon to start... 10:48:03 Starting dockerd 10:48:05 . 10:48:06 Traceback (most recent call last): 10:48:06 File "/usr/local/lib/python2.7/dist-packages/_pytest/config.py", line 320, in _importconftest 10:48:06 mod = conftestpath.pyimport() 10:48:06 File "/usr/local/lib/python2.7/dist-packages/py/_path/local.py", line 662, in pyimport 10:48:06 __import__(modname) 10:48:06 File "/docker-py/tests/integration/conftest.py", line 6, in <module> 10:48:06 import docker.errors 10:48:06 File "/docker-py/docker/__init__.py", line 2, in <module> 10:48:06 from .api import APIClient 10:48:06 File "/docker-py/docker/api/__init__.py", line 2, in <module> 10:48:06 from .client import APIClient 10:48:06 File "/docker-py/docker/api/client.py", line 6, in <module> 10:48:06 import requests 10:48:06 ImportError: No module named requests 10:48:06 ERROR: could not load /docker-py/tests/integration/conftest.py 10:48:06 and 00:38:55 File "/docker-py/docker/transport/ssladapter.py", line 21, in <module> 00:38:55 from backports.ssl_match_hostname import match_hostname 00:38:55 ImportError: No module named backports.ssl_match_hostname 00:38:55 ERROR: could not load /docker-py/tests/integration/conftest.py To fix, install the missing python modules. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-08-22 12:10:55 +00:00
python-backports.ssl-match-hostname \
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 \
Dockerfiles: fix test-docker-py Presumably after switch to debian-stretch as a base, the following errors happens in Jenkins: 10:48:03 ---> Making bundle: test-docker-py (in bundles/17.06.0-dev/test-docker-py) 10:48:03 ---> Making bundle: .integration-daemon-start (in bundles/17.06.0-dev/test-docker-py) 10:48:03 Using test binary docker 10:48:03 # DOCKER_EXPERIMENTAL is set: starting daemon with experimental features enabled! 10:48:03 /etc/init.d/apparmor: 130: /etc/init.d/apparmor: systemd-detect-virt: not found 10:48:03 Starting AppArmor profiles:Warning from stdin (line 1): /sbin/apparmor_parser: cannot use or update cache, disable, or force-complain via stdin 10:48:03 Warning failed to create cache: (null) 10:48:03 . 10:48:03 INFO: Waiting for daemon to start... 10:48:03 Starting dockerd 10:48:05 . 10:48:06 Traceback (most recent call last): 10:48:06 File "/usr/local/lib/python2.7/dist-packages/_pytest/config.py", line 320, in _importconftest 10:48:06 mod = conftestpath.pyimport() 10:48:06 File "/usr/local/lib/python2.7/dist-packages/py/_path/local.py", line 662, in pyimport 10:48:06 __import__(modname) 10:48:06 File "/docker-py/tests/integration/conftest.py", line 6, in <module> 10:48:06 import docker.errors 10:48:06 File "/docker-py/docker/__init__.py", line 2, in <module> 10:48:06 from .api import APIClient 10:48:06 File "/docker-py/docker/api/__init__.py", line 2, in <module> 10:48:06 from .client import APIClient 10:48:06 File "/docker-py/docker/api/client.py", line 6, in <module> 10:48:06 import requests 10:48:06 ImportError: No module named requests 10:48:06 ERROR: could not load /docker-py/tests/integration/conftest.py 10:48:06 and 00:38:55 File "/docker-py/docker/transport/ssladapter.py", line 21, in <module> 00:38:55 from backports.ssl_match_hostname import match_hostname 00:38:55 ImportError: No module named backports.ssl_match_hostname 00:38:55 ERROR: could not load /docker-py/tests/integration/conftest.py To fix, install the missing python modules. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-08-22 12:10:55 +00:00
python-requests \
Update Dockerfiles to use Debian stretch The main gain here is that they all use exactly the same distro; previously arm64 was using Ubuntu Xenial because Debian jessie was too old. Does not seem that we can change any of the downloaded dependencies still, as eg libseccomp is still not the version we are using. Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-01 13:26:13 +00:00
python-setuptools \
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 \
Dockerfiles: fix test-docker-py Presumably after switch to debian-stretch as a base, the following errors happens in Jenkins: 10:48:03 ---> Making bundle: test-docker-py (in bundles/17.06.0-dev/test-docker-py) 10:48:03 ---> Making bundle: .integration-daemon-start (in bundles/17.06.0-dev/test-docker-py) 10:48:03 Using test binary docker 10:48:03 # DOCKER_EXPERIMENTAL is set: starting daemon with experimental features enabled! 10:48:03 /etc/init.d/apparmor: 130: /etc/init.d/apparmor: systemd-detect-virt: not found 10:48:03 Starting AppArmor profiles:Warning from stdin (line 1): /sbin/apparmor_parser: cannot use or update cache, disable, or force-complain via stdin 10:48:03 Warning failed to create cache: (null) 10:48:03 . 10:48:03 INFO: Waiting for daemon to start... 10:48:03 Starting dockerd 10:48:05 . 10:48:06 Traceback (most recent call last): 10:48:06 File "/usr/local/lib/python2.7/dist-packages/_pytest/config.py", line 320, in _importconftest 10:48:06 mod = conftestpath.pyimport() 10:48:06 File "/usr/local/lib/python2.7/dist-packages/py/_path/local.py", line 662, in pyimport 10:48:06 __import__(modname) 10:48:06 File "/docker-py/tests/integration/conftest.py", line 6, in <module> 10:48:06 import docker.errors 10:48:06 File "/docker-py/docker/__init__.py", line 2, in <module> 10:48:06 from .api import APIClient 10:48:06 File "/docker-py/docker/api/__init__.py", line 2, in <module> 10:48:06 from .client import APIClient 10:48:06 File "/docker-py/docker/api/client.py", line 6, in <module> 10:48:06 import requests 10:48:06 ImportError: No module named requests 10:48:06 ERROR: could not load /docker-py/tests/integration/conftest.py 10:48:06 and 00:38:55 File "/docker-py/docker/transport/ssladapter.py", line 21, in <module> 00:38:55 from backports.ssl_match_hostname import match_hostname 00:38:55 ImportError: No module named backports.ssl_match_hostname 00:38:55 ERROR: could not load /docker-py/tests/integration/conftest.py To fix, install the missing python modules. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-08-22 12:10:55 +00:00
python-wheel \
Add vim to Dockerfile Why? Most of the time I end up needing an editor when in `make shell`. Spent much time doing `apt-get update && apt-get install vim`. Since we're already installing vim-common anyway... Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-17 21:00:59 +00:00
tar \
Update Dockerfiles to use Debian stretch The main gain here is that they all use exactly the same distro; previously arm64 was using Ubuntu Xenial because Debian jessie was too old. Does not seem that we can change any of the downloaded dependencies still, as eg libseccomp is still not the version we are using. Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-01 13:26:13 +00:00
thin-provisioning-tools \
Add vim to Dockerfile Why? Most of the time I end up needing an editor when in `make shell`. Spent much time doing `apt-get update && apt-get install vim`. Since we're already installing vim-common anyway... Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-17 21:00:59 +00:00
vim \
Replace grimes with tini There is no reason to duplicate efforts and tini is well built and better than grimes. It is a much stronger option for the default init and @krallin has done a great job maintaining it and helping make changes so that it will work with Docker. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-11-03 16:47:50 +00:00
vim-common \
Add vim to Dockerfile Why? Most of the time I end up needing an editor when in `make shell`. Spent much time doing `apt-get update && apt-get install vim`. Since we're already installing vim-common anyway... Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-17 21:00:59 +00:00
xfsprogs \
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
Dockerfile*: bump devmapper library version Let's use latest lvm2 sources to compile the libdevmapper library. Initial reason for compiling devmapper lib from sources was a need to have the static version of the library at hand, in order to build the static dockerd, but note that the same headers/solib are used for dynamic build (dynbinary) as well. The reason for this patch is to enable the deferral removal feature. The supplied devmapper library (and headers) are too old, lacking the needed functions, so the daemon is built with 'libdm_no_deferred_remove' build tag (see the check in hack/make.sh). Because of this, even if the kernel dm driver is perfectly able to support the feature, it can not be used. For more details and background story, see [1]. Surely, one can't just change the version number. While at it: - improve the comments; - remove obsoleted URLs; - remove s390 and ppc configure updates that are no longer needed; - use pkg-config instead of hardcoding the flags (newer lib added some more dependencies); [1] https://github.com/moby/moby/issues/34298 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-08-02 00:29:29 +00:00
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.
vendor: add archive/tar Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-07-14 01:17:16 +00:00
# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
Bump Golang to 1.9.4 This fixes a vulnerability in `go get` (CVE-2018-6574, http://golang.org/issue/23672), but shouldn't really affect our code, but it's good to keep in sync. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-07 22:45:41 +00:00
ENV GO_VERSION 1.9.4
switch all go download links to https://golang.org/dl this switches all go download links to use a redirect, https://golang.org/dl/ instead of the direct source. Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-11-04 14:03:41 +00:00
RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \
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
| 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
project: use vndr for vendoring Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-10-31 18:22:28 +00:00
ENV GOPATH /go
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
Initial implementation of containerd Checkpoint API. Signed-off-by: boucher <rboucher@gmail.com>
2016-05-12 14:52:00 +00:00
# Install CRIU for checkpoint/restore support
CRIU needs a newer version to work with the updates pulled in by containerd 1.0 Signed-off-by: Ross Boucher <rboucher@gmail.com>
2017-12-04 22:45:04 +00:00
ENV CRIU_VERSION 3.6
RUN mkdir -p /usr/src/criu \
Update CRIU github repository Signed-off-by: Ross Boucher <rboucher@gmail.com>
2017-12-04 23:51:08 +00:00
&& curl -sSL https://github.com/checkpoint-restore/criu/archive/v${CRIU_VERSION}.tar.gz | tar -C /usr/src/criu/ -xz --strip-components=1 \
Initial implementation of containerd Checkpoint API. Signed-off-by: boucher <rboucher@gmail.com>
2016-05-12 14:52:00 +00:00
&& cd /usr/src/criu \
&& make \
&& make install-criu
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" \
*: switch to -buildmode=pie Go has supported PIC builds for a while now, and given the security benefits of using PIC binaries we should really enable them. There also appears to be some indication that non-PIC builds have been interacting oddly on ppc64le (the linker cannot load some shared libraries), and using PIC builds appears to solve this problem. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2017-08-02 13:07:36 +00:00
go build -buildmode=pie -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" \
*: switch to -buildmode=pie Go has supported PIC builds for a while now, and given the security benefits of using PIC binaries we should really enable them. There also appears to be some indication that non-PIC builds have been interacting oddly on ppc64le (the linker cannot load some shared libraries), and using PIC builds appears to solve this problem. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2017-08-02 13:07:36 +00:00
go build -buildmode=pie -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
updating notary to released 0.5.0 version Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2016-11-28 18:29:17 +00:00
ENV NOTARY_VERSION v0.5.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" \
*: switch to -buildmode=pie Go has supported PIC builds for a while now, and given the security benefits of using PIC binaries we should really enable them. There also appears to be some indication that non-PIC builds have been interacting oddly on ppc64le (the linker cannot load some shared libraries), and using PIC builds appears to solve this problem. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2017-08-02 13:07:36 +00:00
go build -buildmode=pie -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" \
*: switch to -buildmode=pie Go has supported PIC builds for a while now, and given the security benefits of using PIC binaries we should really enable them. There also appears to be some indication that non-PIC builds have been interacting oddly on ppc64le (the linker cannot load some shared libraries), and using PIC builds appears to solve this problem. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2017-08-02 13:07:36 +00:00
go build -buildmode=pie -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
Bump docker-py to 1d6b5b203222ba5df7dedfcd1ee061a452f99c8a Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-14 13:17:44 +00:00
ENV DOCKER_PY_COMMIT 1d6b5b203222ba5df7dedfcd1ee061a452f99c8a
Dockerfile: move comments to fix build error Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2017-03-16 11:59:10 +00:00
# To run integration tests docker-pycreds is required.
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 \
Fix the rm error message when a container is restarting/paused Running the rm command on a paused/restarting container will give an error message saying the container is running which is incorrect. To fix that, the error message will have the correct container state and a procedure to remove it accordingly. Notice: docker-py was bumped to: 4a08d04aef0595322e1b5ac7c52f28a931da85a5 Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-02-09 10:48:33 +00:00
&& pip install docker-pycreds==0.2.1 \
docker-py: upgrade and fix test script Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-28 16:56:50 +00:00
&& 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 swagger.yaml validation - yamllint to ensure it is a valid YAML file - go-swagger validate to ensure it is a valid swagger file Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-03 17:15:27 +00:00
# Install yamllint for validating swagger.yaml
RUN pip install yamllint==1.5.0
# Install go-swagger for validating swagger.yaml
ENV GO_SWAGGER_COMMIT c28258affb0b6251755d92489ef685af8d4ff3eb
RUN git clone https://github.com/go-swagger/go-swagger.git /go/src/github.com/go-swagger/go-swagger \
&& (cd /go/src/github.com/go-swagger/go-swagger && git checkout -q $GO_SWAGGER_COMMIT) \
&& go install -v github.com/go-swagger/go-swagger/cmd/swagger
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
Remove pkcs11, libltdl-dev, and clang for osx. Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-20 20:39:52 +00:00
ENV DOCKER_BUILDTAGS apparmor 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
Support interactive integration testing. Interactive integration testing is useful when you're developing new tests, or making changes to cli code. Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-18 21:26:35 +00:00
# Add integration helps to bashrc
RUN echo "source $PWD/hack/make/.integration-test-helpers" >> /etc/bash.bashrc
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
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/
Upgrade the frozen images to multi-arch Upgrade the frozen images to the multi-arch ones. Since issue #35963 is not fixed yet on linux/amd64, so we keep the busybox image on amd64 untouched. Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2018-01-05 02:58:14 +00:00
# TODO: when issue #35963 fixed, we can upgrade the busybox to multi-arch
update download-frozen-image.sh to v2 registry Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-31 17:06:22 +00:00
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
Upgrade the frozen images to multi-arch Upgrade the frozen images to the multi-arch ones. Since issue #35963 is not fixed yet on linux/amd64, so we keep the busybox image on amd64 untouched. Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2018-01-05 02:58:14 +00:00
buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
Update frozen images in Dockerfiles This updates the versions of the frozen images used to their current version. The original reason for updating these images was to make sure they are not affected by [CVE-2016-1252 / DSA-3733-1](https://lwn.net/Articles/709119/), which is fixed in apt 1.0.9.8.4 and up. Note that `CVE-2016-1252` won't affect our test-suite, because no packages are installed during out tests. It is just "good practice" to keep these images up to date. The `debian:jessie`, and `buildpack-deps:jessie` in `Dockerfile.s390x`, and `Dockerfile.armhf` have not been updated in this patch, because those images have not yet been updated to contain apt 1.0.9.8.4. While working on this, the `busybox` and `hello-world` were also updated to their latest version. Also removes a reference to `hack/make/.ensure-frozen-images`, which was removed in ff91276d1f5beab5582d9ca582ee01af13198333. The new busybox image has one layer less than the original, so updated `TestBuildSquashParent` to take that into account. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-12-31 19:11:30 +00:00
busybox:latest@sha256:32f093055929dbc23dec4d03e09dfe971f5973a9ca5cf059cbfb644c206aa83f \
Upgrade the frozen images to multi-arch Upgrade the frozen images to the multi-arch ones. Since issue #35963 is not fixed yet on linux/amd64, so we keep the busybox image on amd64 untouched. Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2018-01-05 02:58:14 +00:00
debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \
hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c
Update frozen images in Dockerfiles This updates the versions of the frozen images used to their current version. The original reason for updating these images was to make sure they are not affected by [CVE-2016-1252 / DSA-3733-1](https://lwn.net/Articles/709119/), which is fixed in apt 1.0.9.8.4 and up. Note that `CVE-2016-1252` won't affect our test-suite, because no packages are installed during out tests. It is just "good practice" to keep these images up to date. The `debian:jessie`, and `buildpack-deps:jessie` in `Dockerfile.s390x`, and `Dockerfile.armhf` have not been updated in this patch, because those images have not yet been updated to contain apt 1.0.9.8.4. While working on this, the `busybox` and `hello-world` were also updated to their latest version. Also removes a reference to `hack/make/.ensure-frozen-images`, which was removed in ff91276d1f5beab5582d9ca582ee01af13198333. The new busybox image has one layer less than the original, so updated `TestBuildSquashParent` to take that into account. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-12-31 19:11:30 +00:00
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)
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
Remove cmd/docker and other directories in cli/ in accordance with the new Moby project scope Starting with this commit, integration tests should no longer rely on the docker cli, they should be API tests instead. For the existing tests the scripts will use a frozen version of the docker cli with a DOCKER_API_VERSION frozen to 1.30, which should ensure that the CI remains green at all times. To help contributors develop and test manually with a modified docker cli, this commit also adds a DOCKER_CLI_PATH environment variable to the Makefile. This allows to set the path of a custom cli that will be available inside the development container and used to run the integration tests. Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com> Signed-off-by: Tibor Vass <tibor@docker.com>
2017-04-17 23:18:46 +00:00
# Install tomlv, vndr, runc, containerd, tini, docker-proxy dockercli
project: move go binaries installation to separate script It should allow easier updates for containerd and runc Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-23 16:20:57 +00:00
# Please edit hack/dockerfile/install-binaries.sh to update them.
Add expected 3rd party binaries commit ids to info Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-24 22:18:58 +00:00
COPY hack/dockerfile/binaries-commits /tmp/binaries-commits
project: move go binaries installation to separate script It should allow easier updates for containerd and runc Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-23 16:20:57 +00:00
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
Use gometalinter for linting Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-17 17:52:14 +00:00
RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli gometalinter
Remove cmd/docker and other directories in cli/ in accordance with the new Moby project scope Starting with this commit, integration tests should no longer rely on the docker cli, they should be API tests instead. For the existing tests the scripts will use a frozen version of the docker cli with a DOCKER_API_VERSION frozen to 1.30, which should ensure that the CI remains green at all times. To help contributors develop and test manually with a modified docker cli, this commit also adds a DOCKER_CLI_PATH environment variable to the Makefile. This allows to set the path of a custom cli that will be available inside the development container and used to run the integration tests. Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com> Signed-off-by: Tibor Vass <tibor@docker.com>
2017-04-17 23:18:46 +00:00
ENV PATH=/usr/local/cli:$PATH
Add init process for zombie fighting This adds a small C binary for fighting zombies. It is mounted under `/dev/init` and is prepended to the args specified by the user. You enable it via a daemon flag, `dockerd --init`, as it is disable by default for backwards compat. You can also override the daemon option or specify this on a per container basis with `docker run --init=true|false`. You can test this by running a process like this as the pid 1 in a container and see the extra zombie that appears in the container as it is running. ```c int main(int argc, char ** argv) { pid_t pid = fork(); if (pid == 0) { pid = fork(); if (pid == 0) { exit(0); } sleep(3); exit(0); } printf("got pid %d and exited\n", pid); sleep(20); } ``` Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-27 21:38:47 +00:00
Enable bash completion in development container Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-24 21:51:06 +00:00
# Activate bash completion and include Docker's completion if mounted with DOCKER_BASH_COMPLETION_PATH
RUN echo "source /usr/share/bash-completion/bash_completion" >> /etc/bash.bashrc
Add bash completion to the development container Adds an environment variable `DOCKER_BASH_COMPLETION_PATH` that allows to include a bash completion script into the development container. This is needid for development of bash completion. Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-23 16:05:38 +00:00
RUN ln -s /usr/local/completion/bash/docker /etc/bash_completion.d/docker
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
COPY should be the last op in the Dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-11-09 20:45:11 +00:00
# Options for hack/validate/gometalinter
gometalinter: fix --deadline option 1. Add = between the option and the argument, otherwise the argument appears to be passed on to the linters directly, as in: > DEBUG: [golint.8]: executing /home/kir/go/bin/golint > -min_confidence 0.800000 ./10m ./api ./api/errdefs <...> 2. Fix setting the default for GOMETALINTER_OPTS -- the default was -deadline (rather than --deadline). Fixes: b96093fa56a9 ("gometalinter: add per-platform configurable options") Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-01-16 22:33:06 +00:00
ENV GOMETALINTER_OPTS="--deadline=2m"
COPY should be the last op in the Dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-11-09 20:45:11 +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
gometalinter: add per-platform configurable options I have run into two separate issues while doing 'make all' on armhf (a Scaleway C1 machine, same as used in CI). This commit fixes both. 1. There were a lot of "not enough memory" errors, and after that in a few runs gometalinter just stuck forever on FUTEX_WAIT with no children left. Looking into docs, I found the --enable-gc option which solved the issue. [Update: this has already been added] 2. Timeout of 2 minutes is not enough for the abovementioned platform. The longest running linter is goimports which takes almost 6 minutes to run. Set the timeout to the observable run time roughly doubled. In addition, ARM platforms does not have too much RAM (2GB), so running too many processes in parallel might be problematic. Limit it by using -j2 [v2: make the timeout arch-dependent, also tested on aarch64 (2m15s)] [v3: moved timeout setting to Dockerfiles] [v4: generalized to GOMETALINTER_OPTS, added -j2 for ARM platforms] [v5: rebase to master] Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-09-07 18:59:56 +00:00