Common dockerfile based on cloud-learning-platform

solutions_builder/template_root/components/{{'common' if has_common}}/Dockerfile

@@ -1,12 +1,29 @@
-FROM python:3.9-slim
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM python:3.9.14-slim
+
 WORKDIR /opt
 
-# needed for backports-datetime-fromisoformat in fireo
-RUN apt-get update
-RUN apt-get -y install gcc
+RUN apt-get update && apt-get -y upgrade && \
+    apt-get -y install gcc vim && \
+    apt-get autoremove -yqq --purge && apt-get clean
 
 COPY requirements.txt .
 
-RUN pip install -r requirements.txt
+RUN pip install --upgrade pip && \
+    pip install -r requirements.txt && \
+    rm -Rf /root/.cache/pip
 
 COPY src/ .

solutions_builder/template_root/components/{{'common' if has_common}}/Dockerfile.unittest

@@ -1,14 +1,31 @@
-# changed from slim for FireO
-FROM python:3.9-slim
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM python:3.9.14-slim
+
 WORKDIR /opt
 
-# needed for backports-datetime-fromisoformat in fireo
-RUN apt-get update
-RUN apt-get -y install gcc
+RUN apt-get update && apt-get -y upgrade && \
+    apt-get -y install gcc vim && \
+    apt-get autoremove -yqq --purge && apt-get clean
 
-COPY requirements.txt .
-COPY requirements-test.txt .
+COPY requirements*.txt .
 
+RUN pip install --upgrade pip && \
+    pip install -r requirements.txt && \
+    pip install -r requirements-test.txt && \
+    rm -Rf /root/.cache/pip
 RUN pip install -r requirements.txt
 RUN pip install -r requirements-test.txt
 

solutions_builder/template_root/components/{{'common' if has_common}}/requirements-test.txt

@@ -1,6 +1,6 @@
-backports-unittest-mock
-mock
-pylint
-pytest
-pytest-cov
-pytest-custom_exit_code
+pylint==2.17.2
+pytest-cov==4.0.0
+pytest-custom_exit_code==0.3.0
+pytest-mock==3.10.0
+pytest==7.2.0
+pytz==2023.3

solutions_builder/template_root/components/{{'common' if has_common}}/requirements.txt

@@ -1,6 +1,11 @@
-fireo==1.4.1
-google-cloud-bigquery==2.20.0
-google-cloud-logging
-google-cloud-secret-manager==2.5.0
-jsonschema==3.2.0
+fastapi==0.85.1
+fireo==1.6.2
+google-api-python-client==2.91.0
+google-cloud-bigquery==3.10.0
+google-cloud-logging==3.5.0
+google-cloud-secret-manager==2.16.1
+jsonschema==4.17.3
+gcsfs==2023.6.0
+kubernetes==27.2.0
 pandas==1.2.4
+regex==2023.6.3