From c75f6e19939ebd3e3d8e5acfe9456bdefb7096fd Mon Sep 17 00:00:00 2001 From: Stefano Alberto Russo <stefano.russo@gmail.com> Date: Thu, 4 Jun 2020 14:02:50 +0200 Subject: [PATCH] Added Astrocook Desktop container. --- AstrocookDesktop/Astrocook.desktop | 10 ++++++++ AstrocookDesktop/Dockerfile | 38 ++++++++++++++++++++++++++++++ AstrocookDesktop/build.sh | 12 ++++++++++ AstrocookDesktop/run.sh | 2 ++ 4 files changed, 62 insertions(+) create mode 100755 AstrocookDesktop/Astrocook.desktop create mode 100644 AstrocookDesktop/Dockerfile create mode 100755 AstrocookDesktop/build.sh create mode 100755 AstrocookDesktop/run.sh diff --git a/AstrocookDesktop/Astrocook.desktop b/AstrocookDesktop/Astrocook.desktop new file mode 100755 index 0000000..f597a17 --- /dev/null +++ b/AstrocookDesktop/Astrocook.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Astrocook +Comment= +Exec=python3 -u /home/metauser/astrocook/ac_gui.py +Icon=utilities-terminal +Path= +Terminal=true +StartupNotify=false diff --git a/AstrocookDesktop/Dockerfile b/AstrocookDesktop/Dockerfile new file mode 100644 index 0000000..f0340e9 --- /dev/null +++ b/AstrocookDesktop/Dockerfile @@ -0,0 +1,38 @@ +FROM sarusso/basicmetadesktop:v0.2.0 +MAINTAINER Stefano Alberto Russo <stefano.russo@gmail.com> + +# Switch to root user +USER root + +# Install APT dependencies +RUN apt-get install -y python3 python3-pip python3-wxgtk4.0 python3-wxgtk-webview4.0 python3-wxgtk-media4.0 + +# Install PIP dependencies +RUN pip3 install astropy==4.0.0 \ + scipy==1.3.1 \ + specutils==0.6 \ + numpy==1.17.3 \ + lmfit==0.9.14 \ + cycler==0.10.0 \ + statsmodels==0.10.1 \ + matplotlib==3.1.1 \ + sphinx==2.2.0\ + tqdm==4.40.1 + + +# Switch back to metauser user +USER metauser + +# Add Astrocook code (as metauser) +#RUN cd /home/metauser_vanilla +#COPY ./ /metauser/astrocook + +# Clone Astrocook repo (without strict host key checking) +RUN cd /metauser_home_vanilla && GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git clone https://github.com/DAS-OATs/astrocook.git +RUN cd /metauser_home_vanilla/astrocook && git pull && git checkout 303a7fbbaa6de328cc33be439709b7901790902f + +#echo -e "\nStarting Astrocook...\n" > /var/log/astrocook.log +#cd /data && python3 -u /metauser/astrocook/ac_gui.py &>> /var/log/astrocook.log & +#xterm -title "Log" -e "tail -n 1000 -f /var/log/astrocook.log" & +COPY Astrocook.desktop /metauser_home_vanilla/Desktop/ + diff --git a/AstrocookDesktop/build.sh b/AstrocookDesktop/build.sh new file mode 100755 index 0000000..5c61d54 --- /dev/null +++ b/AstrocookDesktop/build.sh @@ -0,0 +1,12 @@ + +#!/bin/bash + +if [ ! -f "Dockerfile" ]; then + # TODO: This check is weak: improve me! + echo "Please run this script from the AstrocookDesktop folder" + exit 1 +fi + +# Use --no-cache in case of build problems (i.e. 404 not found) +docker build . -t astrocookdesktop + diff --git a/AstrocookDesktop/run.sh b/AstrocookDesktop/run.sh new file mode 100755 index 0000000..0a5d3db --- /dev/null +++ b/AstrocookDesktop/run.sh @@ -0,0 +1,2 @@ +#!/bin/bash +docker run -v$PWD/:/data -p5900:5900 -p8590:8590 -it astrocookdesktop -- GitLab