Review main Merged

82761[TASK] Use `podman` before `docker` in `Build/Scripts/runTests.sh`

Stefan Bürk CR +2 V +2 Easy +15 −6 updated 02/02/24, 16:21

Commit message

The `Build/Scripts/runTests.sh` supports `podman` and `docker`
as container cli binary since quite a while now, albeit docker
has been kept as default if not specified using `-b`.

This change removes the hard default and will now use `podman`
as default. In case `podman` is not available `docker` is used.
As a side-effect, the binary for CI is no longer enforced the
hard way.

PostgreSQL 16 is added as database version.

Review

  • Code review CR +2 Done
    • Stefan Bürk +2
    • Oliver Klee +1
    • Christian Kuhn +1
  • Verified V +2 Done
    • Stefan Bürk +2
    • Oliver Klee +1
    • Christian Kuhn +1
    • core-ci +1 CI

Issues 1

Files 1

Review log 1620

  1. Stefan Bürk uploaded patch set 1 02/01/24, 17:15

  2. Stefan Bürk uploaded patch set 2 02/01/24, 17:16

  3. Oliver Klee updated the commit message in patch set 3 02/01/24, 17:17

  4. Stefan Bürk uploaded patch set 4 02/01/24, 17:20

  5. core-ci voted on patch set 2 V +1 02/01/24, 17:22 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/52609

  6. core-ci voted on patch set 3 V +1 02/01/24, 17:23 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/52610

  7. core-ci voted on patch set 4 V +1 02/01/24, 17:26 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/52611

  8. Oliver Klee commented on patch set 4 02/01/24, 17:57

    runTests.sh:267

    Adding support for Postgres 16 seems unrelated to switching to Podman and deserves its own change and its own changelog entry, I think.
  9. Stefan Bürk commented on patch set 4 02/01/24, 19:25

    runTests.sh:267 Reply

    Basically you are right, this is about the runTests.sh - therefore this as sidechange is okay here. I would say that i'm nearly the only person using these switches anyway. so let's keep that here as sidechange.
  10. Oliver Klee voted on patch set 4 CR +1 02/01/24, 21:04

  11. Garvin Hicking voted on patch set 4 CR +1 V +1 02/02/24, 12:22

  12. Oliver Klee commented on patch set 4 CR -1 V +1 02/02/24, 12:30

    We also should update the help text (which still says that `docker` is the default).
  13. Oliver Klee commented on patch set 5 CR +1 V +1 02/02/24, 12:30

    Published edit on patch set 4.
  14. Oliver Klee commented on patch set 5 CR +1 V +1 02/02/24, 12:31

    Reply

    Done.
  15. core-ci voted on patch set 5 V +1 02/02/24, 12:37 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/52631

  16. Christian Kuhn voted on patch set 5 CR +1 V +1 02/02/24, 14:45

  17. Andreas Kienast commented on patch set 5 02/02/24, 15:32

    runTests.sh:503

    What happens if `CONTAINER_BIN` remains an empty string, e.g. in case neither podman nor docker are installed?
  18. Stefan Bürk commented on patch set 5 02/02/24, 16:05

    runTests.sh:503 Reply

    If neither docker or podman is available, `runTests.sh` already states this early and break out: https://review.typo3.org/c/Packages/TYPO3.CMS/+/82761/5/Build/Scripts/runTests.sh#b354 So this is safe but uses podman instead of docker if both are installed. if only docker is installed it uses docker. or tries to use the specified binary.
  19. Stefan Bürk voted on patch set 5 CR +2 V +2 02/02/24, 16:06

  20. Stefan Bürk merged patch set 6 02/02/24, 16:21