docs: address docs builds and memcached customization to docker file (#…

…548)
googleapis · Sep 21, 2020 · 88e7e24 · 88e7e24
1 parent 3674650
commit 88e7e24
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 52 deletions.
diff --git a/.kokoro/docker/docs/Dockerfile b/.kokoro/docker/docs/Dockerfile
@@ -20,38 +20,41 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV PATH /usr/local/bin:$PATH
 
 # Install dependencies.
+# Spell check related
+RUN apt-get update && apt-get install -y dictionaries-common aspell aspell-en \
+  hunspell-en-us libenchant1c2a enchant
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-    apt-transport-https \
-    build-essential \
-    ca-certificates \
-    curl \
-    dirmngr \
-    git \
-    gpg-agent \
-    graphviz \
-    libbz2-dev \
-    libdb5.3-dev \
-    libexpat1-dev \
-    libffi-dev \
-    liblzma-dev \
-    libreadline-dev \
-    libsnappy-dev \
-    libssl-dev \
-    libsqlite3-dev \
-    memcached \
-    portaudio19-dev \
-    redis-server \
-    software-properties-common \
-    ssh \
-    sudo \
-    tcl \
-    tcl-dev \
-    tk \
-    tk-dev \
-    uuid-dev \
-    wget \
-    zlib1g-dev \
+  apt-transport-https \
+  build-essential \
+  ca-certificates \
+  curl \
+  dirmngr \
+  git \
+  gpg-agent \
+  graphviz \
+  libbz2-dev \
+  libdb5.3-dev \
+  libexpat1-dev \
+  libffi-dev \
+  liblzma-dev \
+  libreadline-dev \
+  libsnappy-dev \
+  libssl-dev \
+  libsqlite3-dev \
+  memcached \
+  portaudio19-dev \
+  redis-server \
+  software-properties-common \
+  ssh \
+  sudo \
+  tcl \
+  tcl-dev \
+  tk \
+  tk-dev \
+  uuid-dev \
+  wget \
+  zlib1g-dev \
   && add-apt-repository universe \
   && apt-get update \
   && apt-get -y install jq \
@@ -64,28 +67,28 @@ RUN apt-get update \
 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 3.7.8 3.8.5; 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 3.7.8 3.8.5; 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* \

diff --git a/synth.py b/synth.py
@@ -34,4 +34,19 @@
 gcloud --quiet --verbosity=debug datastore indexes create tests/system/index.yaml
 """)
 
+s.replace(
+    ".kokoro/docker/docs/Dockerfile",
+    "libsqlite3-dev.*\n",
+    "\g<0>    memcached \\\n"\
+)
+
+s.replace(
+    ".kokoro/docker/docs/Dockerfile",
+    "# Install dependencies.\n",
+    """\g<0># Spell check related
+RUN apt-get update && apt-get install -y dictionaries-common aspell aspell-en \\
+  hunspell-en-us libenchant1c2a enchant
+"""
+)
+
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)