f20 - update docker requirements and specify 2 vs 3
BUG=None
TEST=./build-dockerimage
Change-Id: I88729cfc31bbfdcdec63830e4b395aa8063d554a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3237601
Auto-Submit: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Jesse McGuire <jessemcguire@google.com>
Reviewed-by: Seewai Fu <seewaifu@google.com>
Tested-by: Derek Beckett <dbeckett@chromium.org>
Commit-Queue: Derek Beckett <dbeckett@chromium.org>
diff --git a/test/container/dockerfiles/Dockerfile b/test/container/dockerfiles/Dockerfile
index 7eba9ab..b596a88 100644
--- a/test/container/dockerfiles/Dockerfile
+++ b/test/container/dockerfiles/Dockerfile
@@ -39,10 +39,12 @@
RUN echo 'chromeos-test ALL=NOPASSWD:ALL' > /etc/sudoers.d/chromeos-test
# Install all packages
-COPY requirements.txt .
+COPY requirements_py2.txt .
+COPY requirements_py3.txt .
+
RUN pip2 install --upgrade pip
-RUN pip2 install -r requirements.txt
-RUN pip3 install -r requirements.txt
+RUN pip2 install -r requirements_py2.txt
+RUN pip3 install -r requirements_py3.txt
# deploy autotest & tast packages
COPY --chown=chromeos-test:chromeos-test autotest/ /usr/local/autotest
diff --git a/test/container/dockerfiles/requirements.in b/test/container/dockerfiles/requirements.in
index 678b217..97fe8dd 100644
--- a/test/container/dockerfiles/requirements.in
+++ b/test/container/dockerfiles/requirements.in
@@ -2,8 +2,14 @@
mock==3.0.5
numpy==1.16.6
pyparsing
-protobuf
+protobuf==3.18.0
six==1.15.0
-python-dateutil
+python-dateutil==2.8.2
selenium==2.37.2
-psutil==2.1.1
\ No newline at end of file
+psutil==5.8.0
+Pillow==8.3.2
+pyasn1==0.4.8
+PyYAML==5.4.1
+requests==2.26.0
+btsocket==0.1.0
+certifi==2021.5.30
\ No newline at end of file
diff --git a/test/container/dockerfiles/requirements.txt b/test/container/dockerfiles/requirements.txt
deleted file mode 100644
index c0e1c1f..0000000
--- a/test/container/dockerfiles/requirements.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-# pip-compile requirements.in
-#
-grpcio==1.31.0
- # via -r requirements.in
-mock==3.0.5
- # via -r requirements.in
-numpy==1.16.6
- # via -r requirements.in
-protobuf==3.17.0
- # via -r requirements.in
-psutil==2.1.1
- # via -r requirements.in
-pyparsing==2.4.7
- # via -r requirements.in
-python-dateutil==2.8.1
- # via -r requirements.in
-selenium==2.37.2
- # via -r requirements.in
-six==1.15.0
- # via
- # -r requirements.in
- # grpcio
- # mock
- # protobuf
- # python-dateutil
diff --git a/test/container/dockerfiles/requirements_py2.txt b/test/container/dockerfiles/requirements_py2.txt
new file mode 100644
index 0000000..65915e10
--- /dev/null
+++ b/test/container/dockerfiles/requirements_py2.txt
@@ -0,0 +1,53 @@
+#
+# This file is autogenerated by pip-compile
+# Then some manaul hacking to get python 2
+# specific packages.
+#
+btsocket==0.1.0
+ # via -r requirements.in
+certifi==2021.5.30
+ # via
+ # -r requirements.in
+ # requests
+chardet==4.0.0
+ # via requests
+grpcio==1.31.0
+ # via -r requirements.in
+idna==2.5
+ # via requests
+mock==3.0.5
+ # via -r requirements.in
+numpy==1.16.6
+ # via -r requirements.in
+pillow==5.2
+ # via -r requirements.in
+protobuf==3.17.0
+ # via -r requirements.in
+psutil==2.1.1
+ # via -r requirements.in
+pyasn1-modules==0.0.8
+ # via -r requirements.in
+pyasn1==0.1.9
+ # via
+ # -r requirements.in
+ # pyasn1-modules
+pyparsing==2.4.7
+ # via -r requirements.in
+python-dateutil==2.8.2
+ # via -r requirements.in
+pyyaml==5.4.1
+ # via -r requirements.in
+oauth2client==1.2
+requests==2.26.0
+ # via -r requirements.in
+selenium==2.37.2
+ # via -r requirements.in
+six==1.15.0
+ # via
+ # -r requirements.in
+ # grpcio
+ # mock
+ # protobuf
+ # python-dateutil
+urllib3==1.26.7
+ # via requests
diff --git a/test/container/dockerfiles/requirements_py3.txt b/test/container/dockerfiles/requirements_py3.txt
new file mode 100644
index 0000000..d28c1a4
--- /dev/null
+++ b/test/container/dockerfiles/requirements_py3.txt
@@ -0,0 +1,48 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+# pip-compile --output-file=requirements3.txt requirements.in
+#
+btsocket==0.1.0
+ # via -r requirements.in
+certifi==2021.5.30
+ # via
+ # -r requirements.in
+ # requests
+charset-normalizer==2.0.7
+ # via requests
+grpcio==1.31.0
+ # via -r requirements.in
+idna==3.3
+ # via requests
+mock==3.0.5
+ # via -r requirements.in
+numpy==1.16.6
+ # via -r requirements.in
+pillow==8.3.2
+ # via -r requirements.in
+protobuf==3.18.0
+ # via -r requirements.in
+psutil==5.8.0
+ # via -r requirements.in
+pyasn1==0.4.8
+ # via -r requirements.in
+pyparsing==2.4.7
+ # via -r requirements.in
+python-dateutil==2.8.2
+ # via -r requirements.in
+pyyaml==5.4.1
+ # via -r requirements.in
+requests==2.26.0
+ # via -r requirements.in
+selenium==2.37.2
+ # via -r requirements.in
+six==1.15.0
+ # via
+ # -r requirements.in
+ # grpcio
+ # mock
+ # python-dateutil
+urllib3==1.26.7
+ # via requests
