Update dockerfile (Upgrading to Ubuntu 22.04 & python 3.10) & requirements files

Alexis Koralewski
1 parent 704f72aa
Showing 4 changed files with 67 additions and 50 deletions Show diff stats
Dockerfile
VERSION
install/requirements.txt
install/requirements_dev.txt
 # https://pythonspeed.com/articles/base-image-python-docker-images
-FROM ubuntu:20.04
+#FROM ubuntu:20.04
+FROM ubuntu:22.04
 #FROM ubuntu:latest
 #FROM ubuntu:21.10 # with python3.9
 #FROM ubuntu:18.04
@@ -36,19 +37,36 @@ RUN apt-get install -y \
     #default-mysql-client \
 	libmysqlclient-dev \
     nano vim \
-    git
+    git \
+	curl
  
  
  
 ################
 # Python & pip #
 ################
-RUN apt-get install -y python3.8
-RUN apt-get install -y python3.8-dev
-RUN apt-get install -y python3-pip
+# For apt-add-repository :
+RUN apt-get install -y software-properties-common
+# Needed for python 3.10
+RUN add-apt-repository ppa:deadsnakes/ppa
+# Needed for INDI
+RUN apt-add-repository ppa:mutlaqja/ppa
+RUN apt-get install -y python3.10
+RUN apt-get install -y python3.10-dev
+RUN apt-get install -y python3.10-distutils
+#RUN ln -sf /usr/bin/python3.10 /usr/bin/python3
+RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 2
+#RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
+RUN ln -sf /usr/bin/python3.10 /usr/bin/python3
+RUN update-alternatives --config python3
+RUN apt-get install -y python3-apt
 RUN cd /usr/bin && ln -s python3 python
+#RUN apt-get install -y python3-pip
+RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10
+#RUN pip3 install --upgrade pip
+RUN python3.10 -m pip install --upgrade pip
+
  
-RUN pip3 install --upgrade pip
  
  
 # DEV only
@@ -75,10 +93,8 @@ RUN apt-get install -y \
  
 # - INDI
 # https://indilib.org/get-indi/download-ubuntu.html
-# For apt-add-repository :
-RUN apt-get install -y software-properties-common
 # Add repository
-RUN apt-add-repository ppa:mutlaqja/ppa
+
 # Add public key for this repo
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 487CEC2B3F33A288
 #RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 487CEC2B3F33A288
@@ -171,8 +187,8 @@ RUN cp .bash_aliases ..
 ENV PATH "$PATH:/home/pyros_user/.local/bin"
  
 # Installing click on the image to prevent error on the first execution of the installation script
-RUN pip install --user click
-
+RUN python3.10 -m pip  install --user click
+RUN python3.10 -m pip  install --user setuptools==58
 # (EP 23/3/2022) Installing pip-tools for the management of all the requirements*.txt files (python dependencies packages)
 # NB :
 # - pip-tools generates a smarter and smaller requirements.txt file than the traditional "pip freeze"
@@ -180,15 +196,15 @@ RUN pip install --user click
 # - Unfortunatly, it is difficult to use with several requirements*.txt files as it is the case for this software : pyros + sphinx + guitastro...
 # - So we cannot yet use it completely and still have to use the traditional "pip install -r" anyway ...
 # - But we can at least use it to generate all the requirements*.txt files in a far better format
-RUN pip install --user pip-tools
+RUN python3.10 -m pip  install --user pip-tools
  
 RUN pip-compile ./vendor/guitastro/install/requirements.in 
 # Installing packages required for Guitastro
-RUN pip install --user -r ./vendor/guitastro/install/requirements.txt
+RUN python3.10 -m pip  install --user -r ./vendor/guitastro/install/requirements.txt
 # Maybe unnecessary because same requirements as for pyros requirements_dev (?)
 #RUN pip install --user -r ./vendor/guitastro/install/requirements_dev.txt
  
 # Installing packages required for PyROS
-RUN pip install --user -r ./install/requirements.txt
-RUN pip install --user -r ./install/requirements_dev.txt
+RUN python3.10 -m pip  install --user -r ./install/requirements.txt
+RUN python3.10 -m pip  install --user -r ./install/requirements_dev.txt
  
-0.6.21.0
 \ No newline at end of file
+0.6.23.0
 \ No newline at end of file
 anyjson==0.3.3
 click==8.0.3
-DateTime==4.3
+DateTime==5.1
 Django==4.1
-django-admin-tools==0.9.1
-django-bootstrap3==21.1
-django-extensions==3.1.5
+django-admin-tools==0.9.2
+django-bootstrap3==23.1
+django-extensions==3.2.1
 # for Django Rest Framework (DRF)
 djangorestframework==3.14.0
 # for Choices
-django-model-utils==4.2.0
+django-model-utils==4.3.1
 django-suit==0.2.28
 django-test-without-migrations==0.6
-#gunicorn==19.8.1
-iso8601==1.0.0
+#gunicorn>=19.8.1
+iso8601==1.1.0
 jdcal==1.4.1
-#lxml==4.3.0
-lxml==4.6.4
-mysqlclient==2.0.3
+#lxml>=4.3.0
+lxml==4.9.2
+mysqlclient==2.1.1
 #pluggy>=0.7
 pluggy==1.0.0
 py==1.11.0
-pytz==2021.3
-requests==2.26.0
+pytz==2023.3
+requests==2.28.2
 six==1.16.0
-sqlparse==0.4.2
-Twisted==21.7.0
+sqlparse==0.4.4
+Twisted==22.10.0
 voevent-parse==1.0.3
-zope.interface==5.4.0
+zope.interface==6.0
  
  
 #
 # For Celery:
 #
-##celery==3.1.23
-##flower==0.9.2
-##amqp==1.4.9
-##amqplib==1.0.2
-##billiard==3.3.0.23
-##kombu==3.0.37
-##django-celery==3.1.17
+##celery>=3.1.23
+##flower>=0.9.2
+##amqp>=1.4.9
+##amqplib>=1.0.2
+##billiard>=3.3.0.23
+##kombu>=3.0.37
+##django-celery>=3.1.17
  
@@ -2,37 +2,38 @@
 # DEV only
 #
  
-django-debug-toolbar==3.2.2
+django-debug-toolbar==4.0.0
 # Modifications 2021 :
 # removing plantuml because we need a unofficial version (maybe we could force to go back on an old version where the bug wasn't happening
 # added httplib2 which is needed for plantuml
 # added dataclasses which was missing for the model controller script
 #plantuml
+
 httplib2==0.20.2
 dataclasses==0.6
 # For YAML Config
 pykwalify==1.8.0
 PyYAML==6.0
 # For SP TAC Assignation
-matplotlib==3.4.3
-numpy==1.21.4
+matplotlib==3.5.1
+numpy==1.24.3
  
 # For working with GIT within Python
-GitPython==3.1.24
+GitPython==3.1.31
 # For working with date
 python-dateutil==2.8.2
  
 # For MCO CNES
  
-astropy
-photutils
-scipy
+astropy==5.2.1
+photutils==1.3.0
+scipy==1.10.1
  
 # for websocket
-channels
-daphne
-attrs==22.1.0
-channels_redis==3.4.1
+channels==4.0.0
+daphne==4.0.0
+attrs==23.1.0
+channels_redis==4.1.0
  
 # To generate API documentation
-uritemplate
 \ No newline at end of file
+uritemplate==4.1.1
 \ No newline at end of file