Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-04 19:10:09 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Python 3.8 to some docker images

Browse Source
This commit is contained in:
Robin Dunn
2019-10-23 18:13:55 -07:00
parent d79d9859cb
commit 9773b1d53c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docker/build/ubuntu-16.04/Dockerfile
View File

@@ -47,7 +47,7 @@ RUN \
if [ ${USE_DEADSNAKES} = yes ]; then add-apt-repository ppa:deadsnakes/ppa; apt-get update; fi; \ if [ ${USE_DEADSNAKES} = yes ]; then add-apt-repository ppa:deadsnakes/ppa; apt-get update; fi; \
apt-get install -y python2.7 python2.7-dev libpython2.7-dev python-virtualenv; \ apt-get install -y python2.7 python2.7-dev libpython2.7-dev python-virtualenv; \
apt-get install -y python3.6 python3.6-dev libpython3.6-dev python3.6-venv; \ apt-get install -y python3.6 python3.6-dev libpython3.6-dev python3.6-venv; \
apt-get install -y python3.7 python3.7-dev libpython3.7-dev python3.7-venv; \ apt-get install -y python3.8 python3.8-dev libpython3.8-dev python3.8-venv; \
apt-get clean; apt-get clean;
# Set the user and group to use for the rest of the commands # Set the user and group to use for the rest of the commands
@@ -62,7 +62,8 @@ RUN \
mkdir -p ${HOME}/venvs; \ mkdir -p ${HOME}/venvs; \
virtualenv --python=python2.7 venvs/Py27; \ virtualenv --python=python2.7 venvs/Py27; \
python3.6 -m venv venvs/Py36; \ python3.6 -m venv venvs/Py36; \
python3.7 -m venv venvs/Py37; python3.7 -m venv venvs/Py37; \
python3.8 -m venv venvs/Py38;
# Add files from host into the container # Add files from host into the container
COPY scripts ${HOME}/bin COPY scripts ${HOME}/bin

6
docker/build/ubuntu-18.04/Dockerfile
View File

@@ -3,7 +3,7 @@ FROM ubuntu:18.04
# Set environment variables # Set environment variables
ENV DIST_NAME=ubuntu-18.04 ENV DIST_NAME=ubuntu-18.04
ENV USE_DEADSNAKES=no ENV USE_DEADSNAKES=yes
ENV USER=wxpy ENV USER=wxpy
ENV HOME=/home/$USER ENV HOME=/home/$USER
ENV PYTHONUNBUFFERED=1 ENV PYTHONUNBUFFERED=1
@@ -52,6 +52,7 @@ RUN \
apt-get install -y python2.7 python2.7-dev libpython2.7-dev python-virtualenv; \ apt-get install -y python2.7 python2.7-dev libpython2.7-dev python-virtualenv; \
apt-get install -y python3.6 python3.6-dev libpython3.6-dev python3.6-venv; \ apt-get install -y python3.6 python3.6-dev libpython3.6-dev python3.6-venv; \
apt-get install -y python3.7 python3.7-dev libpython3.7-dev python3.7-venv; \ apt-get install -y python3.7 python3.7-dev libpython3.7-dev python3.7-venv; \
apt-get install -y python3.8 python3.8-dev libpython3.8-dev python3.8-venv; \
apt-get clean; apt-get clean;
# Add files from host into the container # Add files from host into the container
@@ -70,7 +71,8 @@ RUN \
mkdir -p ${HOME}/venvs; \ mkdir -p ${HOME}/venvs; \
virtualenv --python=python2.7 venvs/Py27; \ virtualenv --python=python2.7 venvs/Py27; \
python3.6 -m venv venvs/Py36; \ python3.6 -m venv venvs/Py36; \
python3.7 -m venv venvs/Py37; python3.7 -m venv venvs/Py37; \
python3.8 -m venv venvs/Py38;
# Define default command # Define default command
CMD ["/bin/bash", "-l"] CMD ["/bin/bash", "-l"]