[master] deb: cleanup makefile, remove unused GITCOMMIT, and pass VERSION_ID through Dockerfile

[thaJeztah]

• relates to docker-buildx-plugin packages use incorrect version format #814

deb: remove unused GITCOMMIT make var

It doesn't appear to be used anywhere

deb: Makefile: sort vars similar to rpm variant

For easier comparing :)

deb: pass VERSION_ID through Dockerfile

We'll be using VERSION_ID in other places, so adding it in the Dockerfile makes
sure it's always present, without having to depend on /etc/os-release.

[thaJeztah]

@crazy-max @vvoland PTAL 🤗

[crazy-max]

I was looking at docker/packaging, and it seems I don't set the version ID atm: https://github.com/docker/packaging/blob/0670638bca56b14897acb897deea11b8a9e46787/pkg/containerd/scripts/pkg-deb-build.sh#L61

└── [4.0K]  ubuntu
    ├── [4.0K]  bionic
    │   ├── [4.0K]  amd64
    │   │   ├── [2.7M]  containerd.io-dbgsym_1.6.14-1_amd64.ddeb
    │   │   ├── [5.6K]  containerd.io_1.6.14-1_amd64.buildinfo
    │   │   ├── [1.3K]  containerd.io_1.6.14-1_amd64.changes
    │   │   └── [ 26M]  containerd.io_1.6.14-1_amd64.deb
    │   ├── [4.0K]  arm
    │   │   └── [4.0K]  v7
    │   │       ├── [2.6M]  containerd.io-dbgsym_1.6.14-1_armhf.ddeb
    │   │       ├── [5.4K]  containerd.io_1.6.14-1_armhf.buildinfo
    │   │       ├── [1.3K]  containerd.io_1.6.14-1_armhf.changes
    │   │       └── [ 19M]  containerd.io_1.6.14-1_armhf.deb
    │   ├── [4.0K]  arm64
    │   │   ├── [2.6M]  containerd.io-dbgsym_1.6.14-1_arm64.ddeb
    │   │   ├── [5.5K]  containerd.io_1.6.14-1_arm64.buildinfo
    │   │   ├── [1.3K]  containerd.io_1.6.14-1_arm64.changes
    │   │   └── [ 19M]  containerd.io_1.6.14-1_arm64.deb
    │   └── [4.0K]  s390x
    │       ├── [2.7M]  containerd.io-dbgsym_1.6.14-1_s390x.ddeb
    │       ├── [5.4K]  containerd.io_1.6.14-1_s390x.buildinfo
    │       ├── [1.3K]  containerd.io_1.6.14-1_s390x.changes
    │       └── [ 20M]  containerd.io_1.6.14-1_s390x.deb

[thaJeztah]

Yes, for containerd it's missing (see docker/containerd-packaging#303), and we should add it there as well. Not sure if we can do it without "penalty" for the current (1.6.x) version (maybe we can). For the plugins we should also fix these (I'm working on some of that right now).

[crazy-max]

I wonder if it should be 1804 instead?

[crazy-max]

Ah nevermind that's the right ID

[thaJeztah]

Oh! Missed your comment; it looks like deb / dpkg is happy with the current (CalVer) format;

dpkg --compare-versions "23.0.0~rc.1-0~ubuntu.22.10.0~kinetic" ">>" "23.0.0~rc.1-0~ubuntu.22.04.0~jammy" && echo "OK" || echo "KO"
OK

dpkg --compare-versions "22.10.0~kinetic" ">>" "22.04.0~jammy" && echo "OK" || echo "KO"
OK

dpkg --compare-versions "22.10" ">>" "22.04" && echo "OK" || echo "KO"
OK

[thaJeztah]

Let me bring this one in; more to follow, but wanted to get the "preparation" steps already merged so that we can focus on the actual fixes 👍