Skip to content

Commit ae28060

Browse files
committed
TT#113650 Upgrade pep8 v1.6.2 to pycodestyle from bullseye
We use quite old pep8 v1.6.2 which in particular misses this change PyCQA/pycodestyle#502 Let's update Dockerfile to use pycodestyle(former pep8) from bullseye. Change-Id: Id29acd80be212cffa127550d9a4deb764a5b5b30 (cherry picked from commit d552f2c0c2bbb8c802aa29ac9c23ed4c12d5a1cc)
1 parent c0a5ac8 commit ae28060

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

t/tap-tests-docker/Dockerfile

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,19 @@
1-
# DOCKER_NAME=jenkins-tap-test-jessie
2-
FROM docker.mgm.sipwise.com/sipwise-jessie:latest
1+
# DOCKER_NAME=jenkins-tap-test-bullseye
2+
FROM docker.mgm.sipwise.com/sipwise-bullseye:latest
33

44
# Important! Update this no-op ENV variable when this Dockerfile
55
# is updated with the current date. It will force refresh of all
66
# of the base images and things like `apt-get update` won't be using
77
# old cached versions when the Dockerfile is built.
8-
ENV REFRESHED_AT 2020-01-24
9-
10-
RUN echo "# generated by Dockerfile from jenkins-tap-test-jessie at $(date)\n\
11-
deb https://deb.sipwise.com/autobuild/ internal-jessie main\n" > \
12-
/etc/apt/sources.list.d/sipwise-internal.list && \
13-
echo "# generated by Dockerfile from jenkins-tap-test-jessie at $(date)\n\
14-
deb [arch=amd64] https://debian.sipwise.com/debian jessie-backports main contrib\n" > \
15-
/etc/apt/sources.list.d/debian-backports.list && \
16-
echo "# generated by Dockerfile from jenkins-tap-test-jessie at $(date)\n\
17-
Explanation: force installing pep8 from jessie-backports\n\
18-
Package: pep8\n\
19-
Pin: release n=jessie-backports\n\
20-
Pin-Priority: 600\n" > /etc/apt/preferences.d/pep8.pref
8+
ENV REFRESHED_AT 2021-08-02
219

2210
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
2311
binutils \
2412
file \
2513
jenkins-debian-glue \
2614
libperl-critic-perl \
2715
parallel \
28-
pep8 \
16+
pycodestyle \
2917
ruby \
3018
shellcheck \
3119
xz-utils && \
@@ -55,12 +43,12 @@ WORKDIR /code/
5543
# (jump to the next section if you don't want to build yourself!):
5644
# NOTE: run the following command from root folder of git repository:
5745
#
58-
# % docker build --tag="jenkins-tap-test-jessie" -f t/tap-tests-docker/Dockerfile .
59-
# % docker run --rm -i -t -v $(pwd):/code/source:rw jenkins-tap-test-jessie:latest bash
46+
# % docker build --tag="jenkins-tap-test-bullseye" -f t/tap-tests-docker/Dockerfile .
47+
# % docker run --rm -i -t -v $(pwd):/code/source:rw jenkins-tap-test-bullseye:latest bash
6048
#
6149
# Use the existing docker image:
62-
# % docker pull docker.mgm.sipwise.com/jenkins-tap-test-jessie
63-
# % docker run --rm -i -t -v $(pwd):/code/source:rw docker.mgm.sipwise.com/jenkins-tap-test-jessie:latest bash
50+
# % docker pull docker.mgm.sipwise.com/jenkins-tap-test-bullseye
51+
# % docker run --rm -i -t -v $(pwd):/code/source:rw docker.mgm.sipwise.com/jenkins-tap-test-bullseye:latest bash
6452
#
6553
# Inside docker (the command is in history, just press UP button):
6654
# LC_ALL=C.UTF-8 SHELL=bash WORKSPACE=/code/ /usr/bin/tap_tool_dispatcher

0 commit comments

Comments
 (0)