Commit Graph

201 Commits

Author SHA1 Message Date
Tomek Mańko
3d25f046b3 docker: add a patch to fix Docker buildkit when using ZFS graph driver.
The patch incorporates changes merged into the upstream in this PR:
https://github.com/moby/moby/pull/43136
2022-03-20 00:26:33 +01:00
Maxine Aubrey
b73b403865
docker: 20.10.12 -> 20.10.13
https://docs.docker.com/engine/release-notes/#201013
2022-03-18 16:27:50 +01:00
Sandro
4e508d5979
Merge pull request #163963 from r-ryantm/auto-update/docker-compose 2022-03-14 01:47:51 +01:00
R. Ryantm
52bc965878 docker-compose_2: 2.3.0 -> 2.3.3 2022-03-13 06:04:27 +00:00
R. Ryantm
c8081af93f docker-buildx: 0.7.1 -> 0.8.0 2022-03-12 06:35:37 +00:00
R. Ryantm
8ec0f86345 docker-compose_2: 2.2.3 -> 2.3.0 2022-03-05 16:42:49 +00:00
Sandro Jäckel
c5ceb2b05c
docker-compose_2: 2.2.2 -> 2.2.3 2022-01-19 14:44:40 +01:00
Sandro Jäckel
259955a975
docker-compose_2: add SuperSandro2000 as maintainer, strip more 2022-01-19 14:43:35 +01:00
zowoq
18f7554a51 docker-compose_2: update vendorSha256 2022-01-11 06:31:22 +10:00
Danielle Lancashire
18d0fe9b69 docker_20_10: 20.10.9 -> 20.10.12 2022-01-06 14:26:57 +00:00
Renaud
93eb018011
Merge pull request #150648 from whentze/master
docker-compose2: pass version to ldflags
2022-01-03 00:07:48 +01:00
Nikolay Amiantov
b4703e11af docker: only add rootless dependencies for the server
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2021-12-22 14:23:23 +03:00
Nikolay Amiantov
721fde93ff docker: add rootless daemon script 2021-12-22 14:18:14 +03:00
whentze
23fc476f99
docker-compose2: pass version to ldflags
The package already has a version in nixpkgs, but reports "dev" when asked via CLI.
With this change, `docker compose version` behaves as expected.
2021-12-14 09:37:47 +01:00
R. Ryantm
5442c772e6 docker-compose_2: 2.0.1 -> 2.2.2 2021-12-11 12:06:53 +00:00
R. Ryantm
73abda994e docker-buildx: 0.6.3 -> 0.7.1 2021-12-06 14:08:58 +00:00
Bastien Rivière
33bc6f8706
docker-compose2: init at 2.0.1 (#141366)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-16 18:19:32 +02:00
Maxine Aubrey
144058e16d
docker: 20.10.8 -> 20.10.9
- https://docs.docker.com/engine/release-notes/#20109
- https://github.com/moby/moby/releases/tag/v20.10.9
- https://github.com/containerd/containerd/releases/tag/v1.4.11
- https://github.com/containerd/containerd/releases/tag/v1.4.10
- https://github.com/opencontainers/runc/releases/tag/v1.0.2
2021-10-04 21:49:38 +02:00
R. RyanTM
db84ea4cfb docker-buildx: 0.6.2 -> 0.6.3 2021-09-06 05:11:06 +00:00
zowoq
69a333ab31 docker-proxy: remove invalid godeps = null 2021-08-27 06:43:33 +10:00
Sandro Jäckel
c2d20d0b59
docker-buildx: fix wrong source hash calculated by r-ryantm 2021-08-26 16:58:39 +02:00
R. RyanTM
6745446b71 docker-buildx: 0.6.1 -> 0.6.2 2021-08-21 21:30:24 +00:00
Maxine Aubrey
078285c645
containerd_1_4: init at 1.4.9 2021-08-11 12:53:10 +02:00
Maxine Aubrey
871730254e
docker: 20.10.7 -> 20.10.8
docker-runc: 1.0.0-rc95 -> 1.0.1
docker-containerd: 1.5.1 -> 1.4.9
2021-08-05 00:38:24 +02:00
R. RyanTM
a2e6029290 docker-buildx: 0.6.0 -> 0.6.1 2021-07-31 11:03:16 +00:00
R. RyanTM
1caa4f9452 docker-buildx: 0.5.1 -> 0.6.0 2021-07-20 01:52:24 +00:00
Mark Vainomaa
e2b28504ab
docker: add @mikroskeem to maintainers 2021-07-12 19:33:03 +03:00
Mark Vainomaa
fc38adafea
docker: narrow patchShebangs 2021-07-12 19:32:15 +03:00
Mark Vainomaa
2c7bdb05de
docker: enable buildx support by default 2021-07-12 19:32:14 +03:00
Mark Vainomaa
1553e742f5
docker: improve readability, drop unneeded substitutes 2021-07-12 19:32:14 +03:00
Mark Vainomaa
ff2c16095d
docker: 20.10.6 -> 20.10.7 2021-07-12 19:32:13 +03:00
Zane van Iperen
9c40b6f375
tini: don't explicitly depend on glibc
* Fixes pkgsStatic.tini build.
* Use postPatch instead of patchPhase
* Moves glibc dependency into docker.docker-tini
2021-06-11 18:03:15 +10:00
Mark Vainomaa
ad256a077b docker: bump runc to 1.0-rc95, fixing CVE-2021-30465 2021-05-28 11:28:02 -07:00
Mark Vainomaa
beab9f0322 docker: use commit hashes instead of tags, fix containerd sha256 2021-05-28 11:28:02 -07:00
Mark Vainomaa
8baf7189b0 docker: drop unused argument, use pname instead of name 2021-05-28 11:28:02 -07:00
Mark Vainomaa
9868aa6050 docker: 20.10.2 -> 20.10.6 2021-05-28 11:28:02 -07:00
zowoq
7233acd515 docker: add clientOnly / docker-client
Currently the docker client is only available on non-linux platforms as `docker`,
this makes the client available on linux and other platforms as `docker-client`.
2021-05-28 08:08:56 +10:00
gfrascadorio
a54bc9b671
docker: fix systemd unit files (#120019)
* docker: fix systemd unit files

Add missing docker.socket file and patch ExecStart in docker.service
so these units are useful on non-nixos systems using systemd.
(issue #70407)

* moved systemd units under: optionalString (stdenv.isLinux)
2021-04-26 02:43:09 +02:00
sternenseemann
b126d5436a docker: move makeWrapper to nativeBuildInputs
This fixes evaluation of docker when cross compiling. Reproducer:

```
nix-repl> (import ./. { crossOverlays = [ (_: _: {}) ]; }).docker
```

Fails on master, resolved with this PR.
2021-04-12 19:06:02 +02:00
Sandro Jäckel
9378fdf87e
iproute: deprecate alias 2021-04-04 01:43:46 +02:00
Ozan Sener
78f322f2d0 dockerTools: fix build on Darwin
Fixes #110665

Introduced by #109420
2021-03-04 16:17:48 +01:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
Andreas Rammhold
ed46383416 docker: allow overriding package inputs per docker package
Previously we could not override the input packages to docker at all as
that had been shadowed due to the usage of inherit in all-package.nix.

We are now mixing the "variable" variables for the build and the
dependency declarations for the package and using callPackage as if each
of the docker packages would be separate files that we evaluate.

This now enables overriding e.g. iptables for a single verison of
docker which previously was not feasible without importing the
default.nix again (and passing different arguments).

> pkgs.docker.override { iptables = pkgs.iptables-nftables-compat; }
2021-01-26 13:08:25 +01:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Ivan Babrou
aea19f284a docker: correct substitution path with buildx enabled
Starting with Docker 20.10, the client repo moved and the path changed.
2021-01-22 13:43:30 -08:00
Ivan Babrou
deb0d298a2 docker: add buildx support to docker client 2021-01-21 12:52:46 -08:00
Ivan Babrou
e431ff7e2e docker-buildx: init at 0.5.1
Installing docker-buildx enables buildx subcommand on the client:

* https://github.com/docker/buildx
2021-01-21 12:52:45 -08:00
Ben Siraphob
108bdac3d9 pkgs/applications: stdenv.lib -> lib 2021-01-15 14:24:03 +07:00
Mark Vainomaa
b451286b1f
docker: 19.03.4 -> 20.10.2 (#108960)
This commit refactors the build process to handle Docker engine and
CLI split.
2021-01-13 11:33:14 +01:00