launchpad-reviewers team mailing list archive

[Andreas Hasenack <mp+482782@xxxxxxxxxxxxxxxxxx>]

Diff comments:

> diff --git a/lpbuildd/target/build_oci.py b/lpbuildd/target/build_oci.py
> index dabb7d7..486778f 100644
> --- a/lpbuildd/target/build_oci.py
> +++ b/lpbuildd/target/build_oci.py
> @@ -79,15 +79,18 @@ class BuildOCI(
>              self._add_docker_engine_proxy_settings()
>          deps.extend(self.vcs_deps)
>          self.backend.run(["apt-get", "-y", "install"] + deps)
> -        # XXX tushar5526 2025-02-14: Pin docker.io version to 20.x for OCI
> -        # builds after recent SRU update that bumped the version to 26.x.
> -        # This is placed temporarily until we add support for OCI compliant
> -        # layout added in 26.x
> +        # XXX jchittum: pin docker.io to last known working version

I know the bug number can be inferred from the PPA name, but I think it should also be here in the comment somewhere, using the LP: #2098106 syntax, so it can just be clicked on.

> +        # provided by the Ubuntu Server team via a PPA
> +        # the PPA version contains an epoch, and will sort higher in version
> +        # to the archive. To revert, simply delete the addition of the PPA
> +        # The PPA only contains docker.io.
>          # For more info: https://bugs.launchpad.net/launchpad/+bug/2098106
>          self.backend.run(
> -            ["apt-get", "-y", "install", "docker.io=20.10.21-0ubuntu1~20.04.2"]
> +            ["add-apt-repository", "-y", "ppa:canonical-server/lp2098106-docker-rollback"]
> +        )
> +        self.backend.run(
> +            ["apt-get", "-y", "install", "docker.io"]
>          )
> -        self.backend.run(["apt-mark", "hold", "docker.io"])
>          if self.backend.supports_snapd:
>              self.snap_store_set_proxy()
>          self.backend.run(["systemctl", "restart", "docker"])


-- 
https://code.launchpad.net/~jchittum/launchpad-buildd/+git/launchpad-buildd/+merge/482782
Your team Launchpad code reviewers is requested to review the proposed merge of ~jchittum/launchpad-buildd:oci-docker-ppa-pin into launchpad-buildd:master.