1
0
mirror of https://github.com/docker/docker-ce-packaging.git synced 2025-04-19 00:04:03 +03:00

1559 Commits

Author SHA1 Message Date
Paweł Gronowski
14fd600fc6
Merge pull request #1185 from crazy-max/buildx-0.23.0
[master] update buildx to v0.23.0
2025-04-18 09:39:18 +00:00
Sebastiaan van Stijn
a8e3bba2e8
Merge pull request #1188 from glours/bump-compose-v2.35.1
bump compose version to v2.35.1
2025-04-17 17:01:52 +02:00
Guillaume Lours
ec4fb7d49f
bump compose verstion to v2.35.1
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2025-04-17 16:31:17 +02:00
CrazyMax
3544c20fd9
update buildx to v0.23.0
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
2025-04-15 18:59:46 +02:00
Sebastiaan van Stijn
e16f46b858
Merge pull request #1181 from vvoland/debian-trixie
deb: Add Debian "Trixie"
2025-04-11 16:31:34 +02:00
Sebastiaan van Stijn
658fd99c56
Merge pull request #1183 from glours/bump-compose-v2.35.0
bump compose version to v2.35.0
2025-04-10 16:54:55 +02:00
Guillaume Lours
002d0d0a0a
bump compose verstion to v2.35.0
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2025-04-10 15:47:11 +02:00
Paweł Gronowski
6364c951ad
deb: Add Debian "Trixie"
Not yet released, but toolchain freeze has been announced
https://lists.debian.org/debian-devel-announce/2025/03/msg00011.html

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-04-09 12:20:58 +02:00
Paweł Gronowski
8a57ed8b45
Merge pull request #1180 from thaJeztah/bump_golang_1.23.8
[master] update to go1.23.8 (fix CVE-2025-22871)
2025-04-03 11:24:22 +00:00
Sebastiaan van Stijn
5da1429736
update to go1.23.8 (fix CVE-2025-22871)
full diff: https://github.com/golang/go/compare/go1.23.7...go1.23.8
release notes: https://go.dev/doc/devel/release#go1.24.2

go1.23.8 (released 2025-04-01) includes security fixes to the net/http package,
as well as bug fixes to the runtime and the go command. See the Go 1.23.8
milestone on our issue tracker for details;

https://github.com/golang/go/issues?q=milestone%3AGo1.23.8+label%3ACherryPickApproved

From the mailing list:

Hello gophers,

We have just released Go versions 1.24.2 and 1.23.8, minor point releases.
These minor releases include 1 security fixes following the security policy:

- net/http: request smuggling through invalid chunked data
  The net/http package accepted data in the chunked transfer encoding
  containing an invalid chunk-size line terminated by a bare LF.
  When used in conjunction with a server or proxy which incorrectly
  interprets a bare LF in a chunk extension as part of the extension,
  this could permit request smuggling.
  The net/http package now rejects chunk-size lines containing a bare LF.
  Thanks to Jeppe Bonde Weikop for reporting this issue.
  This is CVE-2025-22871 and Go issue https://go.dev/issue/71988.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-04-03 12:37:37 +02:00
Paweł Gronowski
251aff2f89
Merge pull request #1179 from thaJeztah/gha_updates
gha:  various tweaks
2025-04-02 14:45:08 +00:00
Paweł Gronowski
77669e5c73
Merge pull request #1177 from vvoland/ubuntu-25.04
Jenkinsfile: add Ubuntu 25.04 "Plucky Puffin" (not yet released)
2025-04-02 14:42:34 +00:00
Sebastiaan van Stijn
95b6b1db2b
gha: update to docker/setup-buildx-action@v3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-04-02 16:25:39 +02:00
Sebastiaan van Stijn
5bf3dd5df6
gha: update to actions/checkout@v4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-04-02 16:25:21 +02:00
Paweł Gronowski
9d43237307
Replace usage of deprecated apt-key
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-04-02 16:23:57 +02:00
Paweł Gronowski
9d763ff09d
Jenkinsfile: add Ubuntu 25.04 "Plucky Puffin" (not yet released)
Adds the upcoming ubuntu release to start testing builds in CI. This
release is a non-LTS release, and planned to be release on April 17, 2025;

- https://wiki.ubuntu.com/Releases
- https://discourse.ubuntu.com/t/plucky-puffin-release-schedule/36461

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-04-02 16:23:54 +02:00
Sebastiaan van Stijn
68cea527a1
gha: add guardrails timeouts on all jobs
We had a few "runaway jobs" in other repos, where the job got stuck, and kept
running for 6 hours (in one case even 24 hours, probably due some github
outage). Some of those jobs could not be terminated.

While running these actions on public repositories doesn't cost us, it's
still not desirable to have jobs running for that long (as they can still
hold up the queue).

This patch adds a blanket "1 hour" time-limit. We should look at tweaking
the limit to actually expected duration, but having a default at least is
a start.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-04-02 16:20:12 +02:00
Sebastiaan van Stijn
6ac023a72c
gha: add concurrency check
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-04-02 16:16:20 +02:00
Sebastiaan van Stijn
50ec2a3b75
gha: set permissions to read-only by default
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-04-02 16:15:31 +02:00
Sebastiaan van Stijn
e11f8c1c77
Merge pull request #1178 from vvoland/gha-distros
ci: Test more distros in GHA workflow
2025-04-02 16:11:12 +02:00
Paweł Gronowski
c4c2b021d2
gha/ci: Update runner to ubuntu-24
ubuntu-20 will be removed soon

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-04-02 14:55:56 +02:00
Paweł Gronowski
0224e5bed5
ci: Test more distros in GHA workflow
Add distros from Jenkinsfile to GHA

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-03-31 17:33:23 +02:00
Paweł Gronowski
fe5019f136
Merge pull request #1169 from p5/fedora-42
feat: enable Fedora 42 packaging
2025-03-28 15:29:25 +00:00
Robert Sturla
0770878603 chore: build Fedora 42 in GitHub Actions CI
Signed-off-by: Robert Sturla <robertsturla@outlook.com>
2025-03-28 09:55:46 +00:00
Robert Sturla
fea785d7d0 fix: update binutils workaround to match containerd packaging
Co-authored-by: Paweł Gronowski <pawel.gronowski@docker.com>
Signed-off-by: Robert Sturla <robertsturla@outlook.com>
2025-03-28 09:42:32 +00:00
Sebastiaan van Stijn
7e726fa319
Merge pull request #1175 from crazy-max/buildx-0.22.0
update buildx to v0.22.0
2025-03-18 16:33:17 +01:00
CrazyMax
68558b5663
update buildx to v0.22.0
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
2025-03-18 15:31:17 +01:00
Paweł Gronowski
a678f42ffb
Merge pull request #1173 from crazy-max/buildx-0.21.3
update buildx to v0.21.3
2025-03-17 18:12:58 +00:00
CrazyMax
86b2c545d3
update buildx to v0.21.3
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
2025-03-17 18:27:05 +01:00
Paweł Gronowski
341e90186f
Merge pull request #1172 from glours/bump-compose-v2.34.0
bump compose verstion to v2.34.0
2025-03-14 10:22:06 +00:00
Guillaume Lours
2acb9dbddf
bump compose verstion to v2.34.0
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2025-03-14 10:59:19 +01:00
Sebastiaan van Stijn
7bf4649d74
Merge pull request #1171 from vvoland/update-go
update to go1.23.7
2025-03-06 13:30:39 +01:00
Paweł Gronowski
0faee18c86
update to go1.23.7
- https://github.com/golang/go/issues?q=milestone%3AGo1.23.7+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.23.6...go1.23.7

These minor releases include 1 security fixes following the security policy:

net/http, x/net/proxy, x/net/http/httpproxy: proxy bypass using IPv6 zone IDs

Matching of hosts against proxy patterns could improperly treat an IPv6
zone ID as a hostname component. For example, when the NO_PROXY
environment variable was set to "*.example.com", a request to
"[::1%25.example.com]:80` would incorrectly match and not be proxied.

Thanks to Juho Forsén of Mattermost for reporting this issue.

This is CVE-2025-22870 and Go issue https://go.dev/issue/71984.

View the release notes for more information:
https://go.dev/doc/devel/release#go1.23.7

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-03-04 23:05:45 +01:00
Sebastiaan van Stijn
a442459f41
Merge pull request #1170 from crazy-max/buildx-0.21.2
update buildx to v0.21.2
2025-03-03 20:57:59 +01:00
CrazyMax
ebad453f35
update buildx to v0.21.2
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
2025-03-03 17:34:03 +01:00
Robert Sturla
489ccf578d feat: enable Fedora 42 packaging
Enables docker-ce builds for Fedora 42.  This will be GA in a couple months, and like usual,
has a lifespan of two years.

The workarounds required for Go on ARM are still required on this version, so have
been left in.  The comments are still relevant.

Signed-off-by: Robert Sturla <robertsturla@outlook.com>
2025-02-26 20:18:44 +00:00
Sebastiaan van Stijn
d8abe31e7f
Merge pull request #1168 from glours/bump-compose-v2.33.1
bump compose verstion to v2.33.1
2025-02-21 16:57:08 +01:00
Guillaume Lours
38a8224603
bump compose verstion to v2.33.1
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2025-02-21 16:21:37 +01:00
Sebastiaan van Stijn
d3c8f6ceb5
Merge pull request #1167 from crazy-max/buildx-0.21.1
[master] update buildx to v0.21.1
2025-02-21 15:16:03 +01:00
CrazyMax
866c8f16a0
update buildx to v0.21.1
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
2025-02-21 14:27:16 +01:00
Paweł Gronowski
cdaf310f79
Merge pull request #1166 from thompson-shaun/update-buildx
[master] bump buildx to v0.21.0
2025-02-19 21:01:48 +00:00
Shaun Thompson
8cbecebe2e
Bump buildx to v0.21.0
Signed-off-by: Shaun Thompson <shaun.thompson@docker.com>
2025-02-19 14:11:59 -05:00
Paweł Gronowski
25aa48b772
Merge pull request #1165 from vvoland/update-buildx
[master] Bump buildx to v0.21.0-rc2
2025-02-17 12:10:31 +00:00
Paweł Gronowski
ab5860eab7
Bump buildx to v0.21.0-rc2
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-02-17 12:52:19 +01:00
Sebastiaan van Stijn
240a045a1f
Merge pull request #1163 from ndeloof/bump_compose_v2.33.0
Bump compose v2.33.0
2025-02-14 18:07:03 +01:00
Nicolas De Loof
6d02ed4647
Bump compose v2.33.0
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2025-02-13 09:30:23 +01:00
Paweł Gronowski
cf7fc55905
Merge pull request #1161 from vvoland/update-go
[master] update to go1.23.6
2025-02-06 16:12:28 +00:00
Paweł Gronowski
d1014916fe
update to go1.23.6
This minor release include 1 security fix following the security policy:

- crypto/elliptic: timing sidechannel for P-256 on ppc64le

  Due to the usage of a variable time instruction in the assembly implementation
  of an internal function, a small number of bits of secret scalars are leaked on
  the ppc64le architecture. Due to the way this function is used, we do not
  believe this leakage is enough to allow recovery of the private key when P-256
  is used in any well known protocols.

This is CVE-2025-22866 and Go issue https://go.dev/issue/71383.

View the release notes for more information:
https://go.dev/doc/devel/release#go1.23.6

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-02-06 16:44:48 +01:00
Sebastiaan van Stijn
90ffcbe8d0
Merge pull request #1159 from thaJeztah/dockerd_manpages
[master] deb,rpm: include dockerd man-page in docker-ce package
2025-01-27 16:52:05 +01:00
Sebastiaan van Stijn
3ded61e6d7
deb,rpm: include dockerd man-page in docker-ce package
When splitting the docker CLI from the moby/moby repository, the dockerd
documentation and man-pages were moved to the CLI repository. This was a
bit of a bad choice, as now the documentation and code lived in separate
repositories, but when the CLI and dockerd packages were split, the man
page for dockerd ended up in the CLI package.

Starting with [moby@d6e9b5f], the dockerd man-page has been reintegrated
into the moby repository, which means that we can build the man-page
from that repository, and remove it from the CLI repository.

This patch updates the packing to do so:

Before this patch;

    dpkg-deb -c docker-ce_0.0.0~20250124134141.b8879a4-1~ubuntu.24.04~noble_arm64.deb | grep -E '^-'
    -rw-r--r-- root/root       642 2025-01-24 14:29 ./etc/default/docker
    -rwxr-xr-x root/root      2946 2025-01-24 14:29 ./etc/init.d/docker
    -rwxr-xr-x root/root   2741336 2025-01-24 19:54 ./usr/bin/docker-proxy
    -rw-r--r-- root/root      1727 2025-01-24 14:29 ./usr/lib/systemd/system/docker.service
    -rw-r--r-- root/root       295 2025-01-24 14:29 ./usr/lib/systemd/system/docker.socket
    -rwxr-xr-x root/root    604336 2025-01-24 19:54 ./usr/libexec/docker/docker-init
    -rw-r--r-- root/root      2248 2025-01-24 14:29 ./usr/share/doc/docker-ce/README.md
    -rw-r--r-- root/root       168 2025-01-24 19:54 ./usr/share/doc/docker-ce/changelog.Debian.gz

    rpm -qpl ./docker-ce-0.0.0~20250124134141.b8879a4-0.fc41.aarch64.rpm
    /etc/docker
    /usr/bin/docker-proxy
    /usr/bin/dockerd
    /usr/lib/systemd/system/docker.service
    /usr/lib/systemd/system/docker.socket
    /usr/libexec/docker/docker-init

With this patch:

    dpkg-deb -c docker-ce_0.0.0~20250124134141.b8879a4-1~ubuntu.24.04~noble_arm64.deb | grep -E '^-'
    -rw-r--r-- root/root       642 2025-01-24 14:29 ./etc/default/docker
    -rwxr-xr-x root/root      2946 2025-01-24 14:29 ./etc/init.d/docker
    -rwxr-xr-x root/root   2741336 2025-01-24 20:55 ./usr/bin/docker-proxy
    -rwxr-xr-x root/root  79458592 2025-01-24 20:55 ./usr/bin/dockerd
    -rw-r--r-- root/root      1727 2025-01-24 14:29 ./usr/lib/systemd/system/docker.service
    -rw-r--r-- root/root       295 2025-01-24 14:29 ./usr/lib/systemd/system/docker.socket
    -rwxr-xr-x root/root    604336 2025-01-24 20:55 ./usr/libexec/docker/docker-init
    -rw-r--r-- root/root      2248 2025-01-24 14:29 ./usr/share/doc/docker-ce/README.md
    -rw-r--r-- root/root       166 2025-01-24 20:55 ./usr/share/doc/docker-ce/changelog.Debian.gz
    -rw-r--r-- root/root      6561 2025-01-24 20:55 ./usr/share/man/man8/dockerd.8.gz

    rpm -qpl ./docker-ce-0.0.0~20250124134141.b8879a4-0.fc41.aarch64.rpm
    /etc/docker
    /usr/bin/docker-proxy
    /usr/bin/dockerd
    /usr/lib/systemd/system/docker.service
    /usr/lib/systemd/system/docker.socket
    /usr/libexec/docker/docker-init
    /usr/share/man/man8/dockerd.8.gz

Given that the dockerd man-page was previously packaged as part of docker-ce-cli,
we need to add a "Replaces:" condition to the package, to prevent dpkg from
detecting it as a conflict when an older version of the docker-ce-cli package
was installed that contains the manpage;

    Unpacking docker-ce (5:0.0.0~20250124134141.b8879a4-1~raspbian.12~bookworm) ...
    dpkg: error processing archive ./deb/debbuild/raspbian-bookworm/docker-ce_0.0.0~20250124134141.b8879a4-1~raspbian.12~bookworm_armhf.deb (--install):
    trying to overwrite '/usr/share/man/man8/dockerd.8.gz', which is also in package docker-ce-cli 5:0.0.0~20250124134141.b8879a4-1~raspbian.12~bookworm

From the [Debian manual][1]

> 7.6.1. Overwriting files in other packages
>
> It is usually an error for a package to contain files which are on the
> system in another package. However, if the overwriting package declares
> that it Replaces the one containing the file being overwritten, then dpkg
> will replace the file from the old package with that from the new. The
> file will no longer be listed as “owned” by the old package and will be
> taken over by the new package.

[1]: https://www.debian.org/doc/debian-policy/ch-relationships.html
[moby@d6e9b5f]: d6e9b5fe30

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-27 16:19:54 +01:00