PYROS-IRAP / pyros

Commit c1067e640fcd3e9475010bb64f8e38b8e8168532

Authored by Etienne Pallier
1 parent 6b979525
Exists in dev

Changement OS pour Dockerfile : passage de Debian11 a Ubuntu20.04 pour compatibi… 

…lite Indi de Guitastro
Showing 1 changed file with 29 additions and 17 deletions   Show diff stats
Inline Side-by-side
1 -FROM python:3.8 1 +FROM ubuntu:20.04
2 2
3 ARG uid 3 ARG uid
4 4
5 RUN apt-get update && apt-get install -y \ 5 RUN apt-get update && apt-get install -y \
6 default-mysql-client \ 6 default-mysql-client \
  7 + libmysqlclient-dev \
7 git \ 8 git \
8 nano \ 9 nano \
9 vim 10 vim
10 11
  12 +RUN apt-get install -y python3.8
  13 +RUN apt-get install -y python3-pip
  14 +
  15 +
11 # DEV only 16 # DEV only
12 # for dot => PNG diagrams generation with pyreverse (pylint) 17 # for dot => PNG diagrams generation with pyreverse (pylint)
  18 +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
13 RUN apt-get install -y graphviz graphviz-dev 19 RUN apt-get install -y graphviz graphviz-dev
  20 +RUN apt-get install -y python3-tk
14 21
15 # Guitastro 22 # Guitastro
16 RUN apt-get install -y \ 23 RUN apt-get install -y \
17 # - ASTROMETRY.NET (in order to process images locally, without having to send (big) images to astrometry.net) 24 # - ASTROMETRY.NET (in order to process images locally, without having to send (big) images to astrometry.net)
18 - astrometry.net astrometry-data-tycho2 25 + astrometry.net astrometry-data-tycho2 \
19 #astrometry-data-2mass 26 #astrometry-data-2mass
20 # - PIL 27 # - PIL
21 - #python3-pil python3-pil.imagetk  
22 - #python3-venv  
23 - #python3-pip 28 + python3-pil python3-pil.imagetk
24 29
25 # - INDI => for Guitastro 30 # - INDI => for Guitastro
26 # https://indilib.org/get-indi/download-ubuntu.html 31 # https://indilib.org/get-indi/download-ubuntu.html
@@ -36,16 +41,16 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 487CEC2B3F @@ -36,16 +41,16 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 487CEC2B3F
36 #RUN apt-key adv --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys 487CEC2B3F33A288 41 #RUN apt-key adv --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys 487CEC2B3F33A288
37 #10 1.751 E: The repository 'http://ppa.launchpad.net/mutlaqja/ppa/ubuntu jammy InRelease' is not signed. 42 #10 1.751 E: The repository 'http://ppa.launchpad.net/mutlaqja/ppa/ubuntu jammy InRelease' is not signed.
38 RUN apt-get update 43 RUN apt-get update
39 -#RUN apt-get install -y indi-full  
40 -#RUN apt-get install -y gsc  
41 -#RUN apt-get install -y kstars-bleeding  
42 -#RUN apt-get install -y libindi1  
43 -#RUN apt-get install -y indi-bin  
44 -#RUN apt-get install -y swig  
45 -#RUN apt-get install -y libz3-dev  
46 -#RUN apt-get install -y libcfitsio-dev  
47 -#RUN apt-get install -y libnova-dev  
48 -#RUN apt-get install -y libindi-dev 44 +RUN apt-get install -y indi-full
  45 +RUN apt-get install -y gsc
  46 +RUN apt-get install -y kstars-bleeding
  47 +RUN apt-get install -y libindi1
  48 +RUN apt-get install -y indi-bin
  49 +RUN apt-get install -y swig
  50 +RUN apt-get install -y libz3-dev
  51 +RUN apt-get install -y libcfitsio-dev
  52 +RUN apt-get install -y libnova-dev
  53 +RUN apt-get install -y libindi-dev
49 # Obligatoire ? 54 # Obligatoire ?
50 #RUN pip install --user --install-option="--prefix=" pyindi-client 55 #RUN pip install --user --install-option="--prefix=" pyindi-client
51 56
@@ -58,11 +63,14 @@ RUN rm ./astap_amd64.deb @@ -58,11 +63,14 @@ RUN rm ./astap_amd64.deb
58 63
59 # - PYLON (Cameras BASLER) => for Guitastro 64 # - PYLON (Cameras BASLER) => for Guitastro
60 # https://www.baslerweb.com/en/products/software/basler-pylon-camera-software-suite/ 65 # https://www.baslerweb.com/en/products/software/basler-pylon-camera-software-suite/
  66 +# (you will have to fill a form to be able to download)
61 # pylon_6.3.0.23157_x86_64_setup.tar.gz 67 # pylon_6.3.0.23157_x86_64_setup.tar.gz
62 # tar -xvf pylon_6.3.0.23157_x86_64_setup.tar.gz 68 # tar -xvf pylon_6.3.0.23157_x86_64_setup.tar.gz
63 # copier le fichier pylon_6.3.0.23157_x86_64.tar.gz à l’endroit où installer le logiciel. 69 # copier le fichier pylon_6.3.0.23157_x86_64.tar.gz à l’endroit où installer le logiciel.
64 # tar -xvf pylon_6.3.0.23157_x86_64.tar.gz 70 # tar -xvf pylon_6.3.0.23157_x86_64.tar.gz
65 # apt-get install ./pylon_6.3.0.23157-deb0_amd64.deb 71 # apt-get install ./pylon_6.3.0.23157-deb0_amd64.deb
  72 +COPY ./install/guitastro/pylon_6.3.0.23157-deb0_amd64.deb .
  73 +RUN apt-get install ./pylon_6.3.0.23157-deb0_amd64.deb
66 74
67 # Guitastro DEV only 75 # Guitastro DEV only
68 76
@@ -75,6 +83,10 @@ RUN rm ./astap_amd64.deb @@ -75,6 +83,10 @@ RUN rm ./astap_amd64.deb
75 # apt install spyder 83 # apt install spyder
76 # apt install graphviz libgraphviz-dev 84 # apt install graphviz libgraphviz-dev
77 85
  86 +#RUN apt-get install -y firefox x11vnc xvfb
  87 +#RUN echo "exec firefox" > ~/.xinitrc && chmod +x ~/.xinitrc
  88 +#CMD ["x11vnc", "-create", "-forever"]
  89 +#RUN x11vnc -create -forever
78 90
79 91
80 # Get IRAP self signed certificate 92 # Get IRAP self signed certificate
@@ -92,9 +104,9 @@ WORKDIR /home/pyros_user/app @@ -92,9 +104,9 @@ WORKDIR /home/pyros_user/app
92 USER pyros_user 104 USER pyros_user
93 105
94 RUN pip install --user --upgrade pip 106 RUN pip install --user --upgrade pip
95 -RUN pip install --user wheel 107 +#RUN pip install --user wheel
96 # TODO: pourquoi numpy ??? A virer ? 108 # TODO: pourquoi numpy ??? A virer ?
97 -RUN pip install --user numpy 109 +#RUN pip install --user numpy
98 110
99 # Copy local host machine files to image 111 # Copy local host machine files to image
100 COPY --chown=pyros_user:pyros_user . . 112 COPY --chown=pyros_user:pyros_user . .