Skip to content

Commit 4826337

Browse files
fix: add hashes to requirements.txt (#1544)
* fix: add hashes to requirements.txt and update Docker images so they require hashes. * fix: add hashes to docker/owlbot/java/src * Squashed commit of the following: commit ab7384e Author: Jeffrey Rennie <[email protected]> Date: Tue Aug 23 11:38:48 2022 -0700 fix: remove pip install statements (#1546) because the tools are already installed in the docker image as of googleapis/testing-infra-docker#227 commit 302667c Author: WhiteSource Renovate <[email protected]> Date: Tue Aug 23 19:50:28 2022 +0200 chore(deps): update dependency setuptools to v65.2.0 (#1541) Co-authored-by: Anthonios Partheniou <[email protected]> commit 6e9054f Author: WhiteSource Renovate <[email protected]> Date: Tue Aug 23 19:42:51 2022 +0200 chore(deps): update dependency nbconvert to v7 (#1543) Co-authored-by: Anthonios Partheniou <[email protected]> commit d229a12 Author: Alexander Fenster <[email protected]> Date: Mon Aug 22 15:04:53 2022 -0700 fix: update google-gax and remove obsolete deps (#1545) commit 13ce626 Author: Jeffrey Rennie <[email protected]> Date: Mon Aug 22 11:08:21 2022 -0700 chore: remove release config and script (#1540) We don't release to pypi anymore. * chore: rollback java changes to move forward with other languages until Java's docker image is fixed
1 parent 69fabae commit 4826337

File tree

6 files changed

+330
-21
lines changed

6 files changed

+330
-21
lines changed

docker/owlbot/nodejs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get install -y nodejs
2626

2727
###################### Install synthtool's requirements.
2828
COPY requirements.txt /synthtool/requirements.txt
29-
RUN pip install -r /synthtool/requirements.txt
29+
RUN pip install --require-hashes -r /synthtool/requirements.txt
3030

3131
# Put synthtool in the PYTHONPATH so owlbot.py scripts will find it.
3232
ENV PYTHONPATH="/synthtool"

docker/owlbot/nodejs_mono_repo/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get install -y nodejs
2626

2727
###################### Install synthtool's requirements.
2828
COPY requirements.txt /synthtool/requirements.txt
29-
RUN pip install -r /synthtool/requirements.txt
29+
RUN pip install --require-hashes -r /synthtool/requirements.txt
3030

3131
# Put synthtool in the PYTHONPATH so owlbot.py scripts will find it.
3232
ENV PYTHONPATH="/synthtool"

docker/owlbot/php/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get install -y nodejs
2626

2727
###################### Install synthtool's requirements.
2828
COPY requirements.txt /synthtool/requirements.txt
29-
RUN pip install -r /synthtool/requirements.txt
29+
RUN pip install --require-hashes -r /synthtool/requirements.txt
3030

3131
# Put synthtool in the PYTHONPATH so owlbot.py scripts will find it.
3232
ENV PYTHONPATH="/synthtool"

docker/owlbot/python/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN make altinstall
3434

3535
###################### Install synthtool's requirements.
3636
COPY requirements.txt /synthtool/requirements.txt
37-
RUN pip install -r /synthtool/requirements.txt
37+
RUN pip install --require-hashes -r /synthtool/requirements.txt
3838

3939
# Put synthtool in the PYTHONPATH so owlbot.py scripts will find it.
4040
ENV PYTHONPATH="/synthtool"

requirements.in

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
setuptools==65.0.1
2+
3+
nox
4+
requests
5+
pyyaml
6+
jinja2
7+
deprecation
8+
protobuf==3.20.1
9+
watchdog
10+
11+
# some java processing requires xml handling
12+
lxml
13+
14+
# Install sample-tester for generated samples
15+
sample-tester
16+
17+
# flake8 is used to validate the python samples noxfile template
18+
flake8

0 commit comments

Comments
 (0)