servod: Change from servod supplied uhubctl to os package version.
Servod is going to stop distributing this binary as it is labstation
satlab specific. It has already been moved to labstation on in the
ChromeOS builds.
BUG=b:330576788
TEST=build the container locally and ran uhubctl -v and which uhubctl
Change-Id: I86df87741b856f7efb0f7b5ac82ee461075e751d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/xolabs-common-core/+/5829772
Tested-by: Keith Haddow <[email protected]>
Reviewed-by: Michal Matyjek <[email protected]>
Auto-Submit: Keith Haddow <[email protected]>
Commit-Queue: Michal Matyjek <[email protected]>
Commit-Queue: Keith Haddow <[email protected]>
diff --git a/src/dockerfiles/servod/Dockerfile b/src/dockerfiles/servod/Dockerfile
index 276c42b..3e7b2fd 100644
--- a/src/dockerfiles/servod/Dockerfile
+++ b/src/dockerfiles/servod/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Copyright 2021 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -11,8 +11,15 @@
bzip2 \
curl \
fdisk \
+ uhubctl \
python-is-python3
+# As part of the migration from servod supplied to package supplied uhubctl
+# remove any provided install and link the package install as the power code
+# expects the binary to be in a specific location.
+RUN rm -f /usr/local/bin/uhubctl
+RUN ln -s /usr/sbin/uhubctl /usr/local/bin/uhubctl
+
# Avoid watchtower updating servod, it gets pulled before every start of the
# container, we should not stop/start it in the case a new version is pushed.
LABEL com.centurylinklabs.watchtower.enable="false"
