From 45995308b62ac5a6ce077ec00f5d2356b4e69b8d Mon Sep 17 00:00:00 2001
From: Ivan Cheung <ivans.mailbox@gmail.com>
Date: Wed, 29 Jun 2022 14:58:24 -0400
Subject: [PATCH 1/3] Updated Dockerfile from using Python 3.6 to 3.7

---
 .kokoro/docker/Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile
index fb3e9083a791..80b07ff7b7c1 100644
--- a/.kokoro/docker/Dockerfile
+++ b/.kokoro/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# 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.
@@ -142,14 +142,14 @@ RUN set -ex \
   && rm -rf ~/.cache/
 
 
-# Install pip on Python 3.6 only.
+# Install pip on Python 3.7 only.
 # If the environment variable is called "PIP_VERSION", pip explodes with
 # "ValueError: invalid truth value '<VERSION>'"
 ENV PYTHON_PIP_VERSION 21.3.1
 RUN wget --no-check-certificate -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
-    && python3.6 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
+    && python3.7 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
   # we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
-  # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
+  # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.7/site-packages")
   # https://github.com/docker-library/python/pull/143#issuecomment-241032683
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
   # then we use "pip list" to ensure we don't have more than one pip version installed
@@ -167,7 +167,7 @@ RUN pip install --no-cache-dir virtualenv
 # Setup Cloud SDK
 ENV CLOUD_SDK_VERSION 389.0.0
 # Use system python for cloud sdk.
-ENV CLOUDSDK_PYTHON python3.6
+ENV CLOUDSDK_PYTHON python3.7
 RUN wget https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz
 RUN tar xzf google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz
 RUN /google-cloud-sdk/install.sh
@@ -191,4 +191,4 @@ RUN useradd -d /h -u ${UID} ${USERNAME}
 # Allow nopasswd sudo
 RUN echo "${USERNAME} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
-CMD ["python3.6"]
+CMD ["python3.7"]

From 5dfbe441dc4e1ed6d40c5cc56eea067db1e33e15 Mon Sep 17 00:00:00 2001
From: ivanmkc <ivans.mailbox@gmail.com>
Date: Wed, 29 Jun 2022 16:59:47 -0400
Subject: [PATCH 2/3] Updated Dockerfile to 3.10

---
 .kokoro/docker/Dockerfile | 140 +++++++++++++++++++-------------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile
index 80b07ff7b7c1..be1dffbe98cf 100644
--- a/.kokoro/docker/Dockerfile
+++ b/.kokoro/docker/Dockerfile
@@ -31,41 +31,41 @@ ENV LANG C.UTF-8
 # Install dependencies.
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-    apt-transport-https \
-    build-essential \
-    ca-certificates \
-    curl \
-    dirmngr \
-    git \
-    gcc \
-    gpg-agent \
-    graphviz \
-    libbz2-dev \
-    libdb5.3-dev \
-    libexpat1-dev \
-    libffi-dev \
-    liblzma-dev \
-    libmagickwand-dev \
-    libmemcached-dev \
-    libpython3-dev \
-    libreadline-dev \
-    libsnappy-dev \
-    libssl-dev \
-    libsqlite3-dev \
-    portaudio19-dev \
-    pkg-config \
-    redis-server \
-    software-properties-common \
-    ssh \
-    sudo \
-    systemd \
-    tcl \
-    tcl-dev \
-    tk \
-    tk-dev \
-    uuid-dev \
-    wget \
-    zlib1g-dev \
+  apt-transport-https \
+  build-essential \
+  ca-certificates \
+  curl \
+  dirmngr \
+  git \
+  gcc \
+  gpg-agent \
+  graphviz \
+  libbz2-dev \
+  libdb5.3-dev \
+  libexpat1-dev \
+  libffi-dev \
+  liblzma-dev \
+  libmagickwand-dev \
+  libmemcached-dev \
+  libpython3-dev \
+  libreadline-dev \
+  libsnappy-dev \
+  libssl-dev \
+  libsqlite3-dev \
+  portaudio19-dev \
+  pkg-config \
+  redis-server \
+  software-properties-common \
+  ssh \
+  sudo \
+  systemd \
+  tcl \
+  tcl-dev \
+  tk \
+  tk-dev \
+  uuid-dev \
+  wget \
+  zlib1g-dev \
   && apt-get clean autoclean \
   && apt-get autoremove -y \
   && rm -rf /var/lib/apt/lists/* \
@@ -75,13 +75,13 @@ RUN apt-get update \
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 
 RUN add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable"
+  "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+  $(lsb_release -cs) \
+  stable"
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-    docker-ce \
+  docker-ce \
   && apt-get clean autoclean \
   && apt-get autoremove -y \
   && rm -rf /var/lib/apt/lists/* \
@@ -104,8 +104,8 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
   && curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list > /etc/apt/sources.list.d/mssql-release.list \
   && apt-get update \
   && ACCEPT_EULA=Y apt-get install -y --no-install-recommends \
-    msodbcsql17 \
-    unixodbc-dev \
+  msodbcsql17 \
+  unixodbc-dev \
   && apt-get clean autoclean \
   && apt-get autoremove -y \
   && rm -rf /var/lib/apt/lists/* \
@@ -114,47 +114,47 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
 COPY fetch_gpg_keys.sh /tmp
 # Install the desired versions of Python.
 RUN set -ex \
-    && export GNUPGHOME="$(mktemp -d)" \
-    && echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf" \
-    && /tmp/fetch_gpg_keys.sh \
-    && for PYTHON_VERSION in 2.7.18 3.6.15 3.7.12 3.8.12 3.9.7 3.10.0; do \
-        wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
-        && wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
-        && gpg --batch --verify python-${PYTHON_VERSION}.tar.xz.asc python-${PYTHON_VERSION}.tar.xz \
-        && rm -r python-${PYTHON_VERSION}.tar.xz.asc \
-        && mkdir -p /usr/src/python-${PYTHON_VERSION} \
-        && tar -xJC /usr/src/python-${PYTHON_VERSION} --strip-components=1 -f python-${PYTHON_VERSION}.tar.xz \
-        && rm python-${PYTHON_VERSION}.tar.xz \
-        && cd /usr/src/python-${PYTHON_VERSION} \
-        && ./configure \
-            --enable-shared \
-            # This works only on Python 2.7 and throws a warning on every other
-            # version, but seems otherwise harmless.
-            --enable-unicode=ucs4 \
-            --with-system-ffi \
-            --without-ensurepip \
-        && make -j$(nproc) \
-        && make install \
-        && ldconfig \
+  && export GNUPGHOME="$(mktemp -d)" \
+  && echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf" \
+  && /tmp/fetch_gpg_keys.sh \
+  && for PYTHON_VERSION in 2.7.18 3.6.15 3.7.12 3.8.12 3.9.7 3.10.0; do \
+  wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
+  && wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
+  && gpg --batch --verify python-${PYTHON_VERSION}.tar.xz.asc python-${PYTHON_VERSION}.tar.xz \
+  && rm -r python-${PYTHON_VERSION}.tar.xz.asc \
+  && mkdir -p /usr/src/python-${PYTHON_VERSION} \
+  && tar -xJC /usr/src/python-${PYTHON_VERSION} --strip-components=1 -f python-${PYTHON_VERSION}.tar.xz \
+  && rm python-${PYTHON_VERSION}.tar.xz \
+  && cd /usr/src/python-${PYTHON_VERSION} \
+  && ./configure \
+  --enable-shared \
+  # This works only on Python 2.7 and throws a warning on every other
+  # version, but seems otherwise harmless.
+  --enable-unicode=ucs4 \
+  --with-system-ffi \
+  --without-ensurepip \
+  && make -j$(nproc) \
+  && make install \
+  && ldconfig \
   ; done \
   && rm -rf "${GNUPGHOME}" \
   && rm -rf /usr/src/python* \
   && rm -rf ~/.cache/
 
 
-# Install pip on Python 3.7 only.
+# Install pip on Python 3.10 only.
 # If the environment variable is called "PIP_VERSION", pip explodes with
 # "ValueError: invalid truth value '<VERSION>'"
 ENV PYTHON_PIP_VERSION 21.3.1
 RUN wget --no-check-certificate -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
-    && python3.7 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
+  && python3.10 /tmp/get-pip.py "pip==$PYTHON_PIP_VERSION" \
   # we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python
-  # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.7/site-packages")
+  # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.10/site-packages")
   # https://github.com/docker-library/python/pull/143#issuecomment-241032683
-    && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
+  && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
   # then we use "pip list" to ensure we don't have more than one pip version installed
   # https://github.com/docker-library/python/pull/100
-    && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ]
+  && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ]
 
 # Ensure Pip for python3
 RUN python3 /tmp/get-pip.py
@@ -167,7 +167,7 @@ RUN pip install --no-cache-dir virtualenv
 # Setup Cloud SDK
 ENV CLOUD_SDK_VERSION 389.0.0
 # Use system python for cloud sdk.
-ENV CLOUDSDK_PYTHON python3.7
+ENV CLOUDSDK_PYTHON python3.10
 RUN wget https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz
 RUN tar xzf google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz
 RUN /google-cloud-sdk/install.sh
@@ -191,4 +191,4 @@ RUN useradd -d /h -u ${UID} ${USERNAME}
 # Allow nopasswd sudo
 RUN echo "${USERNAME} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
-CMD ["python3.7"]
+CMD ["python3.10"]

From 1b4c4823ccf8ebe44ab3f66d28f5a7cf2ef2e16c Mon Sep 17 00:00:00 2001
From: ivanmkc <ivans.mailbox@gmail.com>
Date: Wed, 29 Jun 2022 16:59:55 -0400
Subject: [PATCH 3/3] Reverted copyright year

---
 .kokoro/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile
index be1dffbe98cf..c6ecdff21279 100644
--- a/.kokoro/docker/Dockerfile
+++ b/.kokoro/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.