aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
diff options
context:
space:
mode:
authorGravatar Lidi Zheng <lidiz@google.com>2018-12-10 16:19:35 -0800
committerGravatar Lidi Zheng <lidiz@google.com>2018-12-10 16:21:49 -0800
commit8cb2d0546d14574977c4943d33bb103954078bbd (patch)
treec7090a0cd3c81e36c95c8a5ca0232d88a6184689 /templates
parent60f2d379fec3364ff59f4f0d463b16275525863d (diff)
Upgrade sanity Docker image to debian:stretch
* Use latest pylint in Python 3.7 (they dropped support for PY2) * Make latest pylint happy * Forced to upgrade to shellcheck 0.4.4 * Make shellcheck 0.4.4 happy * Adopt reviewers' advice to reduce global disabled rules
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"]
-