From 4a94f0496ba713d7120abba50f6a876fd8277d5a Mon Sep 17 00:00:00 2001 From: Davlet Panech Date: Tue, 10 Aug 2021 15:56:11 -0400 Subject: [PATCH] intel-device-plugin: use clearlinux v34900 Upstream's Docker file uses the latest clearlinux/golang image, and also updates all packages while building. As of this writing latest packages in clearlinux are broken and make the docker image unusable after the upgrade. This fix uses a specific version of clearlinux (34900) known to work. Change-Id: Ied58e50972cd38489fc1d341f74642dfc87712fa Closes-Bug: 1939448 Signed-off-by: Davlet Panech --- .../distroless/build-intel-device-plugins-image.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh b/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh index 90c9b2942..9e7d10b0c 100644 --- a/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh +++ b/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh @@ -15,8 +15,15 @@ if [ -z "${IMAGE_TAG}" ]; then fi # https://bugs.launchpad.net/starlingx/+bug/1927153 +# https://bugs.launchpad.net/starlingx/+bug/1939448 # pin clearlinux/golang to the last known working tag -sed -i 's!clearlinux/golang:latest!clearlinux/golang:1.15.10!' build/docker/${DEVICE}.Dockerfile || exit 1 +CLEAR_LINUX_BASE=clearlinux/golang:1.15.10 +CLEAR_LINUX_VERSION=34900 + +sed -i -r \ + -e 's!^(\s*ARG\s+CLEAR_LINUX_BASE\s*=\s*).*!\1'$CLEAR_LINUX_BASE'!' \ + -e 's!^(\s*ARG\s+CLEAR_LINUX_VERSION\s*=\s*).*!\1--version='$CLEAR_LINUX_VERSION'!' \ + build/docker/${DEVICE}.Dockerfile || exit 1 make ${DEVICE}