Skip to content

Commit 8e349d4

Browse files
joanheyfranz1981
authored andcommitted
[toolset] Tfb dockerfile update to Ubuntu22.04 (TechEmpower#8010)
* Tfb dockerfile update to Ubuntu22.04 * Use Curl in both downloads * Use Ubuntu 22.04 * Test CI [ci run-all] * Test CI [ci run-all] * To make happy @volyrique :)
1 parent 98bcf6b commit 8e349d4

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

Dockerfile

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,42 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:22.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
4+
5+
#RUN add-apt-repository universe
46
# WARNING: DON'T PUT A SPACE AFTER ANY BACKSLASH OR APT WILL BREAK
57
# One -q produces output suitable for logging (mostly hides
68
# progress indicators)
79
RUN apt-get -yqq update && apt-get -yqq install \
810
-o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
911
cloc \
12+
curl \
1013
dstat `# Collect resource usage statistics` \
14+
gcc \
1115
git-core \
1216
libmysqlclient-dev `# Needed for MySQL-python` \
1317
libpq-dev \
14-
python-dev \
15-
python-pip \
18+
python2 \
19+
python2.7-dev \
1620
siege \
17-
software-properties-common && \
18-
pip install \
21+
software-properties-common
22+
23+
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
24+
RUN python2 get-pip.py
25+
26+
RUN curl https://raw.githubusercontent.com/paulfitz/mysql-connector-c/master/include/my_config.h --output /usr/include/mysql/my_config.h
27+
28+
RUN pip install \
1929
colorama==0.3.1 \
2030
docker==4.0.2 \
2131
MySQL-python \
2232
psutil \
2333
psycopg2-binary \
2434
pymongo \
25-
requests && \
35+
requests
2636
# Fix for docker-py trying to import one package from the wrong location
27-
cp -r /usr/local/lib/python2.7/dist-packages/backports/ssl_match_hostname \
28-
/usr/lib/python2.7/dist-packages/backports
37+
#cp -r /usr/local/lib/python2.7/dist-packages/backports/ssl_match_hostname \
38+
# /usr/lib/python2.7/dist-packages/backports
2939

3040
ENV FWROOT=/FrameworkBenchmarks PYTHONPATH=/FrameworkBenchmarks
3141

32-
ENTRYPOINT ["python", "/FrameworkBenchmarks/toolset/run-tests.py"]
42+
ENTRYPOINT ["python2", "/FrameworkBenchmarks/toolset/run-tests.py"]

0 commit comments

Comments
 (0)