Commit Graph

321 Commits

Author SHA1 Message Date
b9cfc706d4 Add TESTDIRS back
Makes it simpler to test only one package.
Was removed by #17491.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4a54ab387f4b11310476414f575fb2502970b65d
Component: engine
2015-11-02 19:44:09 +01:00
691e7791f8 Run unit tests as single command
For me it increased speed of unit-tests tremendously, however this disabled
coverage profiles generation, which I think is pretty good tradeoff.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1c23de0e64887f6c36b2156dd65717f723493775
Component: engine
2015-10-29 09:39:51 -07:00
b78e8b7756 docker-py: upgrade and fix test script
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8db141049f5323d754584f265b267e52ee5d9e17
Component: engine
2015-10-28 12:56:50 -04:00
99471f9ab2 update to binaries, fix parsers package, non-parallel test unit
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 9bcbb39fa8b91ceb54c3da7b245e79b56de1cb6b
Component: engine
2015-10-27 14:43:25 -07:00
641ecc1ebd Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install
apparmor check version on deb install
Upstream-commit: 9312a738d84e880bf4635ba4b7729b3c2e017fbc
Component: engine
2015-10-26 22:44:11 +01:00
389b888060 Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest
RPM change install location of Fish completions
Upstream-commit: af6743a6c61b3c854d647975bca3f826ec654b20
Component: engine
2015-10-21 14:36:50 -07:00
7356782f88 Merge pull request #17145 from thaJeztah/deb-add-fish-completions
deb: add fish completions
Upstream-commit: 08fb49597563e66d708098b4391ad7e13d3e619d
Component: engine
2015-10-21 13:58:22 -07:00
2b52981204 add test script for built debs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 14e85c8c556bae67584e71f5c4bb6322c77a3ef5
Component: engine
2015-10-19 16:15:27 -07:00
ee5b4b81d9 add generate aa profile to deb install
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8369f00d30cc1d7823723dec6147f0419e67ad46
Component: engine
2015-10-19 16:15:25 -07:00
3fd414a4f5 fix copy of multiple rpms
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: f549b1c9ea7ff99f9f17e59d65f234d93e85c36c
Component: engine
2015-10-19 16:14:06 -07:00
56a008d359 deb: add fish completions
This adds the Fish completions to the .deb package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6b1a643ac8bf599d04510b26d6d5befefc30ccde
Component: engine
2015-10-17 23:28:11 -07:00
d1e9f4d92c RPM change install location of Fish completions
External completions for fish should be installed
in /usr/local/share/fish/vendor_completions.d to
not conflict with built-in completions.

for reference, see:
https://github.com/fish-shell/fish-shell/issues/1485

fixes #16668

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fb372e66bb9b52bb57d15de04d8af4b94c9e0c14
Component: engine
2015-10-17 22:58:09 -07:00
dabf81be3c Merge pull request #16831 from jfrazelle/release-updates
Release updates
Upstream-commit: e3fabf3ea1548afa3d147eb6f41b8656a70569b7
Component: engine
2015-10-16 16:57:10 -07:00
146e9ba09f Merge pull request #16574 from Djelibeybi/rpm-changelog
Generate a full RPM changelog from the existing CHANGELOG.md file
Upstream-commit: 3668be932e0b3fccd3cde0cff20192c123227a98
Component: engine
2015-10-16 14:55:39 -07:00
d72c4d5a02 update release-deb from the reprepro stuff we don't use
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 3057f0f0a7edd4d38485c5528cc2c991240e6b1c
Component: engine
2015-10-13 15:42:39 -07:00
36fdf8f132 Merge pull request #12648 from estesp/userns-impl
Phase 1 implementation of user namespaces as a remapped container root
Upstream-commit: ed9434c5bb64f49db442027e5e748bfbb46d0a0a
Component: engine
2015-10-10 11:38:07 -07:00
ec720a54c6 Fix few comments in validate scripts
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1ce9be346b0d4df3b9b4fdf521b1cbb9cb111fc0
Component: engine
2015-10-10 11:21:04 +02:00
e36eec68dc Update integration test userns support with flag name change
`--root` is now `--userns-remap`

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: a85e6a4d4a5afc866b153e46e19ed3c15d3a24ec
Component: engine
2015-10-09 20:52:45 -04:00
29fa44dc8c add test-integration-cli specifics for userns
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ea3afdad612448fc6eefcc4bdd63563be8f16946
Component: engine
2015-10-09 20:50:27 -04:00
2932c5b664 add clean apt db to release script
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 96559aaef22923c9c0d3d75e21e0c85f5b5ad47c
Component: engine
2015-10-08 09:21:20 -07:00
1c7020419c add script to generate index listing for the repo if say hosted on s3
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0aee0b1f9e3ffce613a01318cd7e7351025cff0c
Component: engine
2015-10-08 09:21:16 -07:00
3e4d4e0287 Update test-and-docs with TESTDIRS
… and fix the rendering of `make test-unit` with TESTDIRS :)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0542939f405ce6c5cad42bd715d7ceefd573db75
Component: engine
2015-10-04 21:19:04 +02:00
f5a8f1a6e1 Merge pull request #15916 from mikedougherty/release-flexibility
Improve flexibility of release scripts
Upstream-commit: 80e31df3b6fdf6c1fbd6a5d0aceb0a148066508c
Component: engine
2015-09-25 11:26:18 -07:00
c3cad905fa Add documentation files including the LICENSE and CHANGELOG.md to the RPM
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 63e5891e4f9654bc02e113ed0787b6636de3da37
Component: engine
2015-09-25 17:44:11 +10:00
cd15fca4ed Generate a full RPM changelog from the existing CHANGELOG.md file
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 1374ebcde0e936bc687b6b05373e7d2b412baba2
Component: engine
2015-09-25 17:25:00 +10:00
26c6a8d526 Merge pull request #16328 from jfrazelle/opensuse-rpms
add opensuse to rpm builder
Upstream-commit: b0dc11127ef4fc20261ccc0db03a16b17f7f91c4
Component: engine
2015-09-22 15:59:49 -07:00
e6ff3f627c Preserve /etc/sysconfig/docker across rpm update
Otherwise we have to reconfigure every time docker rpm got update.

Signed-off-by: WANG Chao <wcwxyz@gmail.com>
Upstream-commit: b51918fba18999d415cdc555616cc3076db01842
Component: engine
2015-09-17 12:12:28 +08:00
767330f121 Merge pull request #15861 from brahmaroutu/gccgo_x86
Enable building Docker with gcc-go on x86
Upstream-commit: 74a8f2f668380d800c3ecce30fe509d997f9b106
Component: engine
2015-09-16 13:29:02 -07:00
6ad0539e3d adding a Dockerfile.gccgo to use gccgo compiler instead of go compiler.
temporarily disabling registry builds as crypto package is broken with gccgo.

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 2c53643b33fbba5851afcc7067117a7b75cc5dbb
Component: engine
2015-09-16 18:56:01 +00:00
fd675380c0 Revert "Make daemon to start with no userlandproxy by default"
This reverts commit bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 50d7fba7758e8890d49f492c284262ec9aa22190
Component: engine
2015-09-16 09:56:38 -07:00
0b5d2a0494 add opensuse to rpm builder
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b0d4e9d1ba0dec9c43ae212ce10b509da9a05919
Component: engine
2015-09-15 16:18:19 -07:00
862065b3b2 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)
Upstream-commit: e611a189cb3147cd79ccabfe8ba61ae3e3e28459
Component: engine
2015-09-11 16:50:03 -04:00
68a732e052 Make daemon to start with no userlandproxy by default
This PR makes a user visible behavior change with userland
proxy disabled by default and rely on hairpin NAT to be enabled
by default. This may not work in older (unsupported) kernels
where the user will be forced to enable userlandproxy if needed.

      - Updated the Docs
      - Changed the integration-cli to start with userlandproxy
	desiabled by default.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e
Component: engine
2015-09-11 11:58:35 -07:00
dbaa3ef518 Merge pull request #16192 from anusha-ragunathan/dev
Updated rpm spec to perform cleaner installs
Upstream-commit: 72f355e466447f1bee4f9cc8bcab98f8b1560396
Component: engine
2015-09-09 15:26:36 -07:00
f022abdae0 Updated rpm spec to perform cleaner installs
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: 1caa9a7d162be26e2560481b917d1592f724316c
Component: engine
2015-09-09 17:13:57 -04:00
e36e8005d6 Merge pull request #16171 from vdemeester/lint-only-on-diff
Golint only on changed files
Upstream-commit: 00728964453d893dd739bd17d7954324d42b5073
Component: engine
2015-09-09 10:19:16 -07:00
dbc44ea4a3 Merge pull request #16149 from LK4D4/remove_link_libs
Remove -lpthread and -ldl from ldflags
Upstream-commit: 3d8aae13083458d87cc42882fa7c7ce681d620d2
Component: engine
2015-09-09 10:13:36 -07:00
61d8a97de5 Golint only on changed files
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1cca5ee98c3a2e2a2bf7e4e79d9f0a95fef7d169
Component: engine
2015-09-09 09:37:47 +02:00
48de342ac9 Remove -lpthread and -ldl from ldflags
There is no need in those flags now when we use amalgamated sqlite3 from
mattn/go-sqlite3.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 8845eb434596ea709a7ef066d191141331dd1098
Component: engine
2015-09-08 17:01:14 -07:00
fcbe186c1d Update validate-lint to find go files by itself
… and fixes the last bits that were missing :3.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0c70eb83813af6d5266769bc908593f9660b13f1
Component: engine
2015-09-08 22:07:42 +02:00
4d787283f5 Merge pull request #16066 from jfrazelle/remove-reprepro
remove reprepro
Upstream-commit: 90477e8e94b45a52ed8c1a10c48827cef6fc8bdc
Component: engine
2015-09-03 18:20:01 -07:00
8f7f593e20 Merge pull request #16052 from jfrazelle/fix-release-selinux
make docker-engine-selinux findable
Upstream-commit: b01922999626fcafb789eb61957bceaef1f5cdf4
Component: engine
2015-09-03 17:52:39 -07:00
eeddb0adf8 remove reprepro
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: e7cf75c103fe8c21af18f6e1afbccb1c21101081
Component: engine
2015-09-03 17:31:49 -07:00
ff114b4d32 Lint pkg/term/windows package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3409de971c7bd3c84c324d19f422fcb3c6777f02
Component: engine
2015-09-03 22:25:52 +02:00
afcc143845 make docker-engine-selinux findable
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c7b3e7e7701a30ad0eb3f58d9b0cf3149cc82fda
Component: engine
2015-09-03 08:58:33 -07:00
5fbd39445a use apt-ftparchive and reprepro to enable apt-pinning;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 12a71c8954cb51985243cb1afc2841cf7f4ce0a2
Component: engine
2015-09-02 09:32:24 -07:00
37075e2dba Add ability to use a different GPG key identifier
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
Upstream-commit: 7ca017eb622b49dba5ca49a4593dcac76642b38d
Component: engine
2015-08-31 11:27:57 -07:00
ee4aaae33c we dont need the tty in the install script
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 80c32162b5e99e1237a31cead3774474407fe0cf
Component: engine
2015-08-31 08:12:01 -07:00
121bb4177c add selinux-policy and docker-engine-selinux rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8fe675d7992cd44281669e40a33d239dfe8e97e1
Component: engine
2015-08-28 17:54:04 -07:00
634e092800 update spec file to require docker-engine-selinux policy
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: df6d92837029411bd06c4541c08c20127ce8327e
Component: engine
2015-08-28 17:43:30 -07:00