Commit f96a33c
authored
build(python): remove python 3.7 from kokoro Dockerfile (#58)
Source-Link: googleapis/synthtool@e44dc0c
Post-Processor: gcr.io/repo-automation-bots/owlbot-python:latest@sha256:5ff7446edeaede81c3ed58b23a4e76a5403fba1350ce28478045657303b6479d1 parent 81cf380 commit f96a33c
3 files changed
Lines changed: 3 additions & 79 deletions
File tree
- packages/google-cloud-assured-workloads
- .github
- .kokoro/docker/docs
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,3 @@ | |||
| 1 | 1 | docker: | |
| 2 | 2 | image: gcr.io/repo-automation-bots/owlbot-python:latest | |
| 3 | - digest: sha256:e1793a23ae0ee9aafb2e3a53b564a351f74790dbe3c2d75f8fc3b8c43e5c036c | ||
| 3 | + digest: sha256:5ff7446edeaede81c3ed58b23a4e76a5403fba1350ce28478045657303b6479d | ||
Lines changed: 2 additions & 33 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,6 +40,7 @@ RUN apt-get update \ | |||
| 40 | 40 | libssl-dev \ | |
| 41 | 41 | libsqlite3-dev \ | |
| 42 | 42 | portaudio19-dev \ | |
| 43 | + python3-distutils \ | ||
| 43 | 44 | redis-server \ | |
| 44 | 45 | software-properties-common \ | |
| 45 | 46 | ssh \ | |
@@ -59,40 +60,8 @@ RUN apt-get update \ | |||
| 59 | 60 | && rm -rf /var/lib/apt/lists/* \ | |
| 60 | 61 | && rm -f /var/cache/apt/archives/*.deb | |
| 61 | 62 | ||
| 62 | - | ||
| 63 | - COPY fetch_gpg_keys.sh /tmp | ||
| 64 | - # Install the desired versions of Python. | ||
| 65 | - RUN set -ex \ | ||
| 66 | - && export GNUPGHOME="$(mktemp -d)" \ | ||
| 67 | - && echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf" \ | ||
| 68 | - && /tmp/fetch_gpg_keys.sh \ | ||
| 69 | - && for PYTHON_VERSION in 3.7.8 3.8.5; do \ | ||
| 70 | - 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" \ | ||
| 71 | - && 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" \ | ||
| 72 | - && gpg --batch --verify python-${PYTHON_VERSION}.tar.xz.asc python-${PYTHON_VERSION}.tar.xz \ | ||
| 73 | - && rm -r python-${PYTHON_VERSION}.tar.xz.asc \ | ||
| 74 | - && mkdir -p /usr/src/python-${PYTHON_VERSION} \ | ||
| 75 | - && tar -xJC /usr/src/python-${PYTHON_VERSION} --strip-components=1 -f python-${PYTHON_VERSION}.tar.xz \ | ||
| 76 | - && rm python-${PYTHON_VERSION}.tar.xz \ | ||
| 77 | - && cd /usr/src/python-${PYTHON_VERSION} \ | ||
| 78 | - && ./configure \ | ||
| 79 | - --enable-shared \ | ||
| 80 | - # This works only on Python 2.7 and throws a warning on every other | ||
| 81 | - # version, but seems otherwise harmless. | ||
| 82 | - --enable-unicode=ucs4 \ | ||
| 83 | - --with-system-ffi \ | ||
| 84 | - --without-ensurepip \ | ||
| 85 | - && make -j$(nproc) \ | ||
| 86 | - && make install \ | ||
| 87 | - && ldconfig \ | ||
| 88 | - ; done \ | ||
| 89 | - && rm -rf "${GNUPGHOME}" \ | ||
| 90 | - && rm -rf /usr/src/python* \ | ||
| 91 | - && rm -rf ~/.cache/ | ||
| 92 | - | ||
| 93 | 63 | RUN wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \ | |
| 94 | - && python3.7 /tmp/get-pip.py \ | ||
| 95 | 64 | && python3.8 /tmp/get-pip.py \ | |
| 96 | 65 | && rm /tmp/get-pip.py | |
| 97 | 66 | ||
| 98 | - CMD ["python3.7"] | ||
| 67 | + CMD ["python3.8"] | ||
Lines changed: 0 additions & 45 deletions
This file was deleted.
0 commit comments