From 48294d468aaa55fa199c2abc63ae121ce3f7d415 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 1 Dec 2021 17:29:50 +0100 Subject: [PATCH] app-arch/torcx: Fix wrong reference to Docker 19.03 When selecting the docker-1.12-no profile, torcx failed because the profile looked for 19.03 instead of 20.10. Make the docker-1.12-no profile identical to the vendor profile so that we don't have to update it. --- .../coreos-overlay/app-arch/torcx/files/docker-1.12-no.json | 2 +- .../bugfixes/2021-12-01-torcx-docker-1.12-no-profile.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2021-12-01-torcx-docker-1.12-no-profile.md diff --git a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/docker-1.12-no.json b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/docker-1.12-no.json index 4c7dff8875..4480c4e767 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/docker-1.12-no.json +++ b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/docker-1.12-no.json @@ -4,7 +4,7 @@ "images": [ { "name": "docker", - "reference": "19.03" + "reference": "com.coreos.cl" } ] } diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2021-12-01-torcx-docker-1.12-no-profile.md b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2021-12-01-torcx-docker-1.12-no-profile.md new file mode 100644 index 0000000000..dc8fc42a15 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2021-12-01-torcx-docker-1.12-no-profile.md @@ -0,0 +1 @@ +- The Torcx profile `docker-1.12-no` got fixed to reference the current Docker version instead of 19.03 which wasn't found on the image, causing Torcx to fail to provide Docker [PR#1456](https://github.com/flatcar-linux/coreos-overlay/pull/1456)