aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
diff options
context:
space:
mode:
authorGravatar Lidi Zheng <scallopsky@gmail.com>2018-12-20 11:22:37 -0800
committerGravatar GitHub <noreply@github.com>2018-12-20 11:22:37 -0800
commit97453a3d81185c76cc870e732af3c72438e620f0 (patch)
tree9bb5dacdc87679b7a3f463cbce513bed44a96241 /templates
parentb96196f65586ea5832325314adb6f90df07aec51 (diff)
parentdbbb38215847d84f7a5544077024d5a21aed5a8d (diff)
Merge pull request #17303 from lidizheng/sanity-python-3
Run pylint test in Python 3
Diffstat (limited to 'templates')
-rw-r--r--templates/tools/dockerfile/test/sanity/Dockerfile.template22
1 files changed, 9 insertions, 13 deletions
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template
index eac7f2ab01..a4f9183bea 100644
--- a/templates/tools/dockerfile/test/sanity/Dockerfile.template
+++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template
@@ -14,28 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- FROM debian:jessie
-
- <%include file="../../apt_get_basic.include"/>
- <%include file="../../gcp_api_libraries.include"/>
- <%include file="../../python_deps.include"/>
+ <%include file="../../python_stretch.include"/>
<%include file="../../cxx_deps.include"/>
#========================
# Sanity test dependencies
+ RUN apt-get update && apt-get -t testing install -y python3.7 python3-all-dev
+ RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7
+ # Make Python 3.7 the default Python 3 version
+ RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1
RUN apt-get update && apt-get install -y ${"\\"}
- python-pip ${"\\"}
autoconf ${"\\"}
automake ${"\\"}
libtool ${"\\"}
curl ${"\\"}
- python-virtualenv ${"\\"}
- python-lxml ${"\\"}
shellcheck
- RUN pip install simplejson mako
-
+ RUN python2 -m pip install simplejson mako virtualenv lxml
+ RUN python3 -m pip install simplejson mako virtualenv lxml
+
<%include file="../../clang5.include"/>
- <%include file="../../run_tests_addons.include"/>
-
+
# Define the default command.
CMD ["bash"]
-