Add Dockerfile for focal and unify with bionic
This commit is contained in:
parent
e1c4f368d6
commit
d4300c3f6f
18
.buildbot/tox-bionic/Dockerfile
Normal file
18
.buildbot/tox-bionic/Dockerfile
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
FROM ubuntu:bionic
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
|
||||||
|
RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||||
|
software-properties-common build-essential libcap-dev libffi-dev \
|
||||||
|
libssl-dev python-all-dev python-setuptools \
|
||||||
|
python3-dev python3-pip python3.8 python3.8-dev python3.8-venv \
|
||||||
|
python-msgpack python-qt4 language-pack-en qt5dxcb-plugin tor xvfb
|
||||||
|
|
||||||
|
RUN python3.8 -m pip install setuptools wheel
|
||||||
|
RUN python3.8 -m pip install --upgrade pip tox virtualenv
|
||||||
|
|
||||||
|
ENV LANG en_US.UTF-8
|
||||||
|
ENV LANGUAGE en_US:en
|
||||||
|
ENV LC_ALL en_US.UTF-8
|
13
.buildbot/tox-focal/Dockerfile
Normal file
13
.buildbot/tox-focal/Dockerfile
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
FROM ubuntu:focal
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
|
||||||
|
RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||||
|
software-properties-common build-essential libcap-dev libffi-dev \
|
||||||
|
libssl-dev python-all-dev python-setuptools \
|
||||||
|
python3-dev python3-pip python3.9 python3.9-dev python3.9-venv \
|
||||||
|
language-pack-en qt5dxcb-plugin tor xvfb
|
||||||
|
|
||||||
|
RUN python3.9 -m pip install --upgrade pip tox virtualenv
|
1
.buildbot/tox-focal/test.sh
Symbolic link
1
.buildbot/tox-focal/test.sh
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
../tox-bionic/test.sh
|
|
@ -1,18 +0,0 @@
|
||||||
FROM ubuntu:bionic AS tox
|
|
||||||
|
|
||||||
RUN apt-get update
|
|
||||||
|
|
||||||
# Common apt packages
|
|
||||||
RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
|
||||||
software-properties-common build-essential libcap-dev libssl-dev \
|
|
||||||
python-all-dev python-setuptools wget xvfb language-pack-en \
|
|
||||||
libffi-dev python3-dev python3-pip python3.8 python3.8-dev python3.8-venv \
|
|
||||||
python-msgpack python-pip python-qt4 python-six qtbase5-dev qt5-default \
|
|
||||||
tor
|
|
||||||
|
|
||||||
RUN python3.8 -m pip install setuptools wheel
|
|
||||||
RUN python3.8 -m pip install --upgrade pip tox virtualenv
|
|
||||||
|
|
||||||
ENV LANG en_US.UTF-8
|
|
||||||
ENV LANGUAGE en_US:en
|
|
||||||
ENV LC_ALL en_US.UTF-8
|
|
Reference in New Issue
Block a user