fix: install doc uploader and releasetool with hashes (#227)

Hashes ensure we're always running a known version. Installing them in the docker image means the publish and release scripts don't need to install them with a pip command.
googleapis · Aug 22, 2022 · eb2946a · eb2946a
1 parent 0410679
commit eb2946a
Show file tree

Hide file tree

Showing 7 changed files with 1,119 additions and 2 deletions.
diff --git a/node/12-user/Dockerfile b/node/12-user/Dockerfile
@@ -64,6 +64,10 @@ RUN pyenv install 3.7.4 && \
     pyenv global 3.7.4 && \
     python3 -m pip install --upgrade pip setuptools
 
+# Install gcp-uploader and gcp-releasetool and their dependencies.
+COPY requirements.txt requirements.txt
+RUN python3 -m pip install --require-hashes -r requirements.txt
+
 # Setup Cloud SDK
 WORKDIR /home/node
 ENV CLOUD_SDK_VERSION=261.0.0 \

diff --git a/node/12-user/requirements.txt b/node/12-user/requirements.txt
diff --git a/node/14-user/Dockerfile b/node/14-user/Dockerfile
@@ -64,6 +64,10 @@ RUN pyenv install 3.7.4 && \
     pyenv global 3.7.4 && \
     python3 -m pip install --upgrade pip setuptools
 
+# Install gcp-uploader and gcp-releasetool and their dependencies.
+COPY requirements.txt requirements.txt
+RUN python3 -m pip install --require-hashes -r requirements.txt
+
 # Setup Cloud SDK
 WORKDIR /home/node
 ENV CLOUD_SDK_VERSION=303.0.0 \

diff --git a/node/14-user/requirements.txt b/node/14-user/requirements.txt
diff --git a/node/16-user/Dockerfile b/node/16-user/Dockerfile
@@ -60,10 +60,14 @@ RUN echo 'export PATH="/home/node/.pyenv/bin:$PATH"' >> ~/.profile && \
 ENV PATH="/home/node/.pyenv/bin:/home/node/.pyenv/shims:${PATH}"
 
 # Install python
-RUN pyenv install 3.7.1 && \
-    pyenv global 3.7.1 && \
+RUN pyenv install 3.7.4 && \
+    pyenv global 3.7.4 && \
     python3 -m pip install --upgrade pip setuptools
 
+# Install gcp-uploader and gcp-releasetool and their dependencies.
+COPY requirements.txt requirements.txt
+RUN python3 -m pip install --require-hashes -r requirements.txt
+
 # Setup Cloud SDK
 WORKDIR /home/node
 ENV CLOUD_SDK_VERSION=261.0.0 \

diff --git a/node/16-user/requirements.txt b/node/16-user/requirements.txt
diff --git a/node/requirements.in b/node/requirements.in
@@ -0,0 +1,4 @@
+gcp-docuploader
+gcp-releasetool
+importlib-metadata
+typing-extensions