Add and update docker images

RobinD42 · Jun 2, 2023 · a728fa1 · a728fa1
1 parent 8bdbeb7
commit a728fa1
Show file tree

Hide file tree

Showing 10 changed files with 155 additions and 12 deletions.
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -207,7 +207,7 @@ regularBuilders = [ #'build-osx-py36',
                     'build-gtk2-py38',
                     'build-gtk2-py39',
                     #'build-gtk3-py36',
-                    'build-gtk3-py37',
+                    #'build-gtk3-py37',
                     'build-gtk3-py38',
                     'build-gtk3-py39',
                     'build-gtk3-py310',

diff --git a/docker/build/fedora-36/Dockerfile b/docker/build/fedora-36/Dockerfile
@@ -37,7 +37,8 @@ RUN \
 RUN \
 # Install all available Python packages and their dev packages
         dnf -y install python3 python3-tools python3-devel; \
-        dnf -y install python3.9
+        dnf -y install python3.9; \
+        dnf -y install python3.11; \
 
 RUN \
 # Clean up dnf caches
@@ -55,7 +56,8 @@ RUN \
         cd ${HOME}; \
         mkdir -p ${HOME}/venvs; \
         python3.9 -m venv venvs/Py39; \
-        python3.10 -m venv venvs/Py310
+        python3.10 -m venv venvs/Py310; \
+        python3.11 -m venv venvs/Py311;
 
 # Add files from host into the container
 COPY scripts ${HOME}/bin

diff --git a/docker/build/fedora-37/Dockerfile b/docker/build/fedora-37/Dockerfile
@@ -0,0 +1,67 @@
+# The base image
+FROM fedora:37
+
+# Set environment variables
+ENV DIST_NAME=fedora-37
+ENV USER=wxpy
+ENV HOME=/home/$USER
+ENV PYTHONUNBUFFERED=1
+ENV PATH=$HOME/bin:$PATH
+ENV GTK2_OK=no
+
+# Update and install basic OS packages
+RUN \
+        dnf -y update; \
+        dnf -y group install "Development Tools"; \
+        dnf -y install gcc-c++ sudo nano which; \
+# Set up a user, and etc.
+        mkdir -p /dist; \
+        adduser -m ${USER}; \
+        echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
+# Install development packages needed for building wxPython
+        dnf install -y \
+                freeglut-devel \
+                gstreamer1-devel \
+                gstreamer1-plugins-base-devel \
+                gtk3-devel \
+                libjpeg-turbo-devel \
+                libnotify-devel \
+                libpng-devel \
+                libSM-devel \
+                libtiff-devel \
+                libXtst-devel \
+                SDL-devel \
+                webkit2gtk3-devel \
+                which;
+
+RUN \
+# Install all available Python packages and their dev packages
+        dnf -y install python3 python3-tools python3-devel; \
+        dnf -y install python3.9; \
+        dnf -y install python3.10;
+
+RUN \
+# Clean up dnf caches
+        dnf clean all;
+
+
+# Set the user and group to use for the rest of the commands
+USER ${USER}:${USER}
+
+# Set the working directory
+WORKDIR ${HOME}
+
+# Create virtual environments for each Python
+RUN \
+        cd ${HOME}; \
+        mkdir -p ${HOME}/venvs; \
+        python3.9 -m venv venvs/Py39; \
+        python3.10 -m venv venvs/Py310; \
+        python3.11 -m venv venvs/Py311;
+
+# Add files from host into the container
+COPY scripts ${HOME}/bin
+
+# Define default command
+CMD ["/bin/bash", "-l"]
+
diff --git a/docker/build/fedora-38/Dockerfile b/docker/build/fedora-38/Dockerfile
@@ -0,0 +1,67 @@
+# The base image
+FROM fedora:38
+
+# Set environment variables
+ENV DIST_NAME=fedora-38
+ENV USER=wxpy
+ENV HOME=/home/$USER
+ENV PYTHONUNBUFFERED=1
+ENV PATH=$HOME/bin:$PATH
+ENV GTK2_OK=no
+
+# Update and install basic OS packages
+RUN \
+        dnf -y update; \
+        dnf -y group install "Development Tools"; \
+        dnf -y install gcc-c++ sudo nano which; \
+# Set up a user, and etc.
+        mkdir -p /dist; \
+        adduser -m ${USER}; \
+        echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
+# Install development packages needed for building wxPython
+        dnf install -y \
+                freeglut-devel \
+                gstreamer1-devel \
+                gstreamer1-plugins-base-devel \
+                gtk3-devel \
+                libjpeg-turbo-devel \
+                libnotify-devel \
+                libpng-devel \
+                libSM-devel \
+                libtiff-devel \
+                libXtst-devel \
+                SDL-devel \
+                webkit2gtk3-devel \
+                which;
+
+RUN \
+# Install all available Python packages and their dev packages
+        dnf -y install python3 python3-tools python3-devel; \
+        dnf -y install python3.9; \
+        dnf -y install python3.10;
+
+RUN \
+# Clean up dnf caches
+        dnf clean all;
+
+
+# Set the user and group to use for the rest of the commands
+USER ${USER}:${USER}
+
+# Set the working directory
+WORKDIR ${HOME}
+
+# Create virtual environments for each Python
+RUN \
+        cd ${HOME}; \
+        mkdir -p ${HOME}/venvs; \
+        python3.9 -m venv venvs/Py39; \
+        python3.10 -m venv venvs/Py310; \
+        python3.11 -m venv venvs/Py311;
+
+# Add files from host into the container
+COPY scripts ${HOME}/bin
+
+# Define default command
+CMD ["/bin/bash", "-l"]
+
diff --git a/docker/build/rocky-8/Dockerfile b/docker/build/rocky-8/Dockerfile
@@ -43,6 +43,7 @@ RUN \
         yum -y install python3 python3-tools python3-devel; \
         yum -y install python38  python38-devel; \
         yum -y install python39  python39-devel; \
+        yum -y install python3.11  python3.11-devel; \
 # Clean up the yum caches
         yum clean all;
 
@@ -57,7 +58,8 @@ RUN \
         cd ${HOME}; \
         mkdir -p ${HOME}/venvs; \
         python3.8 -m venv venvs/Py38; \
-        python3.9 -m venv venvs/Py39;
+        python3.9 -m venv venvs/Py39; \
+        python3.11 -m venv venvs/Py311;
 
 # Add files from host into the container
 COPY scripts ${HOME}/bin

diff --git a/docker/build/rocky-9/Dockerfile b/docker/build/rocky-9/Dockerfile
@@ -54,7 +54,8 @@ WORKDIR ${HOME}
 RUN \
         cd ${HOME}; \
         mkdir -p ${HOME}/venvs; \
-        python3.9 -m venv venvs/Py39;
+        python3.9 -m venv venvs/Py39; \
+        python3.11 -m venv venvs/Py311;
 
 # Add files from host into the container
 COPY scripts ${HOME}/bin

diff --git a/docker/build/ubuntu-18.04/Dockerfile b/docker/build/ubuntu-18.04/Dockerfile
@@ -49,11 +49,10 @@ RUN \
 # Install all available Python packages and their dev packages
 RUN \
         if [ ${USE_DEADSNAKES} = yes ]; then add-apt-repository -y ppa:deadsnakes/ppa; apt-get update; fi; \
-        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 install -y python3.9 python3.9-dev libpython3.9-dev python3.9-venv; \
         apt-get install -y python3.10 python3.10-dev libpython3.10-dev python3.10-venv; \
+        apt-get install -y python3.11 python3.11-dev libpython3.11-dev python3.11-venv; \
         apt-get clean;
 
 # Add files from host into the container
@@ -70,11 +69,10 @@ WORKDIR ${HOME}
 RUN \
         cd ${HOME}; \
         mkdir -p ${HOME}/venvs; \
-        python3.6 -m venv venvs/Py36; \
-        python3.7 -m venv venvs/Py37; \
         python3.8 -m venv venvs/Py38; \
         python3.9 -m venv venvs/Py39; \
-        python3.10 -m venv venvs/Py310;
+        python3.10 -m venv venvs/Py310; \
+        python3.11 -m venv venvs/Py311;
 
 # Define default command
 CMD ["/bin/bash", "-l"]

diff --git a/docker/build/ubuntu-20.04/Dockerfile b/docker/build/ubuntu-20.04/Dockerfile
@@ -52,6 +52,7 @@ RUN \
         apt-get install -y python3.8 python3.8-dev libpython3.8-dev python3.8-venv; \
         apt-get install -y python3.9 python3.9-dev libpython3.9-dev python3.9-venv; \
         apt-get install -y python3.10 python3.10-dev libpython3.10-dev python3.10-venv; \
+        apt-get install -y python3.10 python3.11-dev libpython3.11-dev python3.11-venv; \
         apt-get clean;
 
 # Add files from host into the container
@@ -70,7 +71,8 @@ RUN \
         mkdir -p ${HOME}/venvs; \
         python3.8 -m venv venvs/Py38; \
         python3.9 -m venv venvs/Py39; \
-        python3.10 -m venv venvs/Py310;
+        python3.10 -m venv venvs/Py310; \
+        python3.11 -m venv venvs/Py311;
 
 # Define default command
 CMD ["/bin/bash", "-l"]

diff --git a/docker/build/ubuntu-22.04/Dockerfile b/docker/build/ubuntu-22.04/Dockerfile
@@ -52,6 +52,7 @@ RUN \
         apt-get install -y python3.8 python3.8-dev libpython3.8-dev python3.8-venv; \
         apt-get install -y python3.9 python3.9-dev libpython3.9-dev python3.9-venv; \
         apt-get install -y python3.10 python3.10-dev libpython3.10-dev python3.10-venv; \
+        apt-get install -y python3.11 python3.11-dev libpython3.11-dev python3.11-venv; \
         apt-get clean;
 
 # Add files from host into the container
@@ -70,7 +71,8 @@ RUN \
         mkdir -p ${HOME}/venvs; \
         python3.8 -m venv venvs/Py38; \
         python3.9 -m venv venvs/Py39; \
-        python3.10 -m venv venvs/Py310;
+        python3.10 -m venv venvs/Py310; \
+        python3.11 -m venv venvs/Py311;
 
 # Define default command
 CMD ["/bin/bash", "-l"]

diff --git a/docker/tasks.py b/docker/tasks.py
@@ -29,6 +29,8 @@
         'fedora-31',
         'fedora-32',
         'fedora-33',
+        'fedora-35',
+        'fedora-36',
         'centos-7',
         'centos-8',
         ]