Create placeholders for stko

Just open xterm
This commit is contained in:
Nathan Franklin 2019-08-16 16:43:34 -05:00
parent fc6c2693d5
commit 67121f5fd6
2 changed files with 6 additions and 14 deletions

View file

@ -109,21 +109,13 @@ COPY --from=builder /src/web/dist/ /usr/local/lib/web/frontend/
RUN apt update \
&& apt install -y \
python3-pip \
python3-dev \
python3-setuptools \
dirmngr \
xterm \
&& apt autoclean \
&& apt autoremove \
&& rm -rf /var/lib/apt/lists/*
RUN echo "deb http://qgis.org/ubuntu bionic main" >> /etc/apt/sources.list
RUN echo "deb-src http://qgis.org/ubuntu bionic main" >> /etc/apt/sources.list
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key CAEB3DC3BDF7FB45
RUN apt update && apt-get install -y qgis python3-qgis qgis-plugin-grass
# Add our STKO (currently using glxgears as example)
RUN apt update && apt-get install -y mesa-utils
COPY image /
EXPOSE 6080
@ -139,4 +131,4 @@ COPY kill.py /
# COPY /etc/pki/tls/certs/designsafe-exec-01.tacc.utexas.edu.cer /etc/nginx/ssl/
# COPY /etc/pki/tls/private/designsafe-exec-01.tacc.utexas.edu.key /etc/nginx/ssl/
# HEALTHCHECK --interval=30s --timeout=5s CMD curl --fail http://127.0.0.1:6079/api/health
ENTRYPOINT ["/startup.sh"]
ENTRYPOINT ["/startup.sh"]

View file

@ -60,10 +60,10 @@ command=bash /usr/local/lib/web/frontend/static/novnc/utils/launch.sh --listen 6
stopasgroup=true
stdout_logfile=/var/log/novnc.log
[program:qgis]
[program:stko]
priority=35
directory=/home/ubuntu/mydata
command=xterm -r -ls -geometry 80x24+10+10 -title '*** Exit this window to kill your QGIS session ***' -e '/usr/bin/qgis --nologo'
command=xterm -r -ls -geometry 80x24+10+10 -title '*** Exit this window to kill your QGIS session ***' -e 'xterm'
user=ubuntu
autostart=true
autorestart=false
@ -74,5 +74,5 @@ redirect_stderr=true
[eventlistener:exit]
command=/kill.py
process_name=qgis
process_name=stko
events=PROCESS_STATE_EXITED