mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2024-11-23 01:01:31 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6 from avatao-content/project_restructure

Browse Source 
Project restructure
This commit is contained in:
Bokros Bálint 2018-02-12 10:55:19 +01:00 committed by GitHub
commit de98ec3391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 61 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
Dockerfile
View File

@ -1,19 +1,19 @@
FROM avatao/ubuntu:16.04 FROM avatao/ubuntu:16.04
RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - &&\ RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - &&\
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - &&\ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - &&\
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list &&\ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list &&\
apt-get update &&\ apt-get update &&\
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
nodejs \ nodejs \
yarn \ yarn \
supervisor \ supervisor \
libzmq5 \ libzmq5 \
nginx \ nginx \
gettext-base \ gettext-base \
libbz2-dev \ libbz2-dev \
libreadline-dev \ libreadline-dev \
libsqlite3-dev &&\ libsqlite3-dev &&\
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
USER ${AVATAO_USER} USER ${AVATAO_USER}
@ -23,14 +23,14 @@ COPY requirements.txt /tmp
ARG PYTHON_VERSION="3.6.4" ARG PYTHON_VERSION="3.6.4"
ARG PYENV_INSTALLER_URL="https://raw.githubusercontent.com/pyenv/pyenv-installer/78cfd4d/bin/pyenv-installer" ARG PYENV_INSTALLER_URL="https://raw.githubusercontent.com/pyenv/pyenv-installer/78cfd4d/bin/pyenv-installer"
ARG PYENV_INSTALLER_HASH=9509348b828f0564358fff456f7f693dd9ace351dc3f240854d7685ad8a8e1dd ARG PYENV_INSTALLER_HASH=9509348b828f0564358fff456f7f693dd9ace351dc3f240854d7685ad8a8e1dd
RUN curl -fSL -o pyenv-installer ${PYENV_INSTALLER_URL} &&\ RUN curl -fSL -o pyenv-installer ${PYENV_INSTALLER_URL} &&\
echo "${PYENV_INSTALLER_HASH} *pyenv-installer" | sha256sum -c - &&\ echo "${PYENV_INSTALLER_HASH} *pyenv-installer" | sha256sum -c - &&\
bash pyenv-installer &&\ bash pyenv-installer &&\
rm pyenv-installer &&\ rm pyenv-installer &&\
echo "source $HOME/.pyenvrc" >> .bashrc &&\ echo "source $HOME/.pyenvrc" >> .bashrc &&\
. $HOME/.pyenvrc &&\ . $HOME/.pyenvrc &&\
pyenv install ${PYTHON_VERSION} &&\ pyenv install ${PYTHON_VERSION} &&\
pyenv global ${PYTHON_VERSION} &&\ pyenv global ${PYTHON_VERSION} &&\
pip install -r /tmp/requirements.txt pip install -r /tmp/requirements.txt
USER root USER root
@ -39,54 +39,57 @@ COPY src/frontend /data/
RUN yarn install --frozen-lockfile RUN yarn install --frozen-lockfile
RUN yarn build --no-progress RUN yarn build --no-progress
ENV TFW_WEB_PORT=4242 ENV TFW_PUBLIC_PORT=8888 \
ENV TFW_LOGIN_APP_PORT=6666 TFW_WEB_PORT=4242 \
ENV TFW_TERMINADO_PORT=7878 TFW_LOGIN_APP_PORT=6666 \
ENV TFW_SUPERVISOR_HTTP_PORT=9001 TFW_TERMINADO_PORT=7878 \
ENV TFW_PUBLIC_PORT=8888 TFW_SUPERVISOR_HTTP_PORT=9001 \
ENV TFW_CONTROLLER_PORT=7777 TFW_CONTROLLER_PORT=7777 \
ENV TFW_CRP_LISTENER_PORT=5555 TFW_CRP_LISTENER_PORT=5555 \
ENV TFW_PUBLISHER_PORT=7654 TFW_PUBLISHER_PORT=7654 \
ENV TFW_RECEIVER_PORT=8765 TFW_RECEIVER_PORT=8765
EXPOSE ${TFW_PUBLIC_PORT}
EXPOSE ${TFW_CRP_LISTENER_PORT}
ENV TFW_SUPERVISOR_HTTP_URI="http://localhost:${TFW_SUPERVISOR_HTTP_PORT}" EXPOSE ${TFW_PUBLIC_PORT} ${TFW_CRP_LISTENER_PORT}
ENV TFW_EVENT_HANDLERS_DIR="/opt/event_handlers"
ENV TFW_APP_DIR="/srv/app" ENV PYTHONPATH="/usr/local/lib/" \
ENV TFW_CONTROLLER_DIR="/srv/controller" TFW_SUPERVISOR_HTTP_URI="http://localhost:${TFW_SUPERVISOR_HTTP_PORT}" \
ENV TFW_FRONTEND_DIR="/srv/frontend" TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf" \
ENV TFW_LOGIN_APP_DIR="/tmp/source_code_server" TFW_SUPERVISORD_COMPONENTS="/etc/supervisor/conf" \
ENV TFW_TERMINADO_DIR="/tmp/terminado_server" TFW_NGINX_CONF="/etc/nginx/sites-enabled/default" \
ENV TFW_WEBIDE_WD="/home/${AVATAO_USER}/workdir" TFW_NGINX_COMPONENTS="/etc/nginx/components" \
ENV TFW_TERMINADO_WD=${TFW_WEBIDE_WD} TFW_LIB_DIR="/usr/local/lib/" \
ENV TFW_LIB_DIR="/usr/local/lib/" TFW_CONTROLLER_DIR="/srv/controller" \
ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf" TFW_TERMINADO_DIR="/tmp/terminado_server" \
ENV TFW_SUPERVISORD_COMPONENTS="/etc/supervisor/conf" TFW_FRONTEND_DIR="/srv/frontend"
ENV TFW_NGINX_CONF="/etc/nginx/sites-enabled/default"
ENV TFW_NGINX_COMPONENTS="/etc/nginx/components"
ENV PYTHONPATH=${TFW_LIB_DIR}
COPY nginx/nginx.conf ${TFW_NGINX_CONF} COPY nginx/nginx.conf ${TFW_NGINX_CONF}
COPY nginx/components/ ${TFW_NGINX_COMPONENTS} COPY nginx/components/ ${TFW_NGINX_COMPONENTS}
RUN chown -R ${AVATAO_USER} /var/log/nginx /var/lib/nginx &&\ RUN chown -R ${AVATAO_USER} /var/log/nginx /var/lib/nginx &&\
sed -i 's#pid /run/nginx.pid;#pid /tmp/nginx.pid;#g' /etc/nginx/nginx.conf &&\ sed -i 's#pid /run/nginx.pid;#pid /tmp/nginx.pid;#g' /etc/nginx/nginx.conf &&\
for f in "${TFW_NGINX_CONF}" ${TFW_NGINX_COMPONENTS}/*.conf; do \ for f in "${TFW_NGINX_CONF}" ${TFW_NGINX_COMPONENTS}/*.conf; do \
envsubst "$(printenv | cut -d= -f1 | grep TFW_ | sed -e 's/^/$/g')" < $f > $f ;\ envsubst "$(printenv | cut -d= -f1 | grep TFW_ | sed -e 's/^/$/g')" < $f > $f ;\
done done
COPY lib ${TFW_LIB_DIR}
COPY supervisor/supervisord.conf ${TFW_SUPERVISORD_CONF} COPY supervisor/supervisord.conf ${TFW_SUPERVISORD_CONF}
COPY supervisor/components/ ${TFW_SUPERVISORD_COMPONENTS} COPY supervisor/components/ ${TFW_SUPERVISORD_COMPONENTS}
COPY src/app ${TFW_APP_DIR} COPY lib ${TFW_LIB_DIR}
COPY src/event_handlers ${TFW_EVENT_HANDLERS_DIR}
COPY src/controller ${TFW_CONTROLLER_DIR} COPY src/controller ${TFW_CONTROLLER_DIR}
COPY lib/tfw/components/terminado_mini_server.py ${TFW_TERMINADO_DIR}/
### TFW internals ^ ### DEMO v ###############################################################
ENV TFW_APP_DIR="/srv/app" \
TFW_LOGIN_APP_DIR="/tmp/source_code_server" \
TFW_WEBIDE_WD="/home/${AVATAO_USER}/workdir" \
TFW_TERMINADO_WD="/home/${AVATAO_USER}/workdir"
RUN mv /data/dist ${TFW_FRONTEND_DIR} RUN mv /data/dist ${TFW_FRONTEND_DIR}
COPY src/event_handlers/source_code_server/server.py ${TFW_LOGIN_APP_DIR}/ COPY src/demo ${TFW_APP_DIR}/
COPY src/event_handlers/source_code_server/users.db ${TFW_LOGIN_APP_DIR}/
COPY src/event_handlers/source_code_server/login_component.py ${TFW_WEBIDE_WD}/ COPY src/demo/source_code_server/server.py ${TFW_LOGIN_APP_DIR}/
COPY src/demo/source_code_server/users.db ${TFW_LOGIN_APP_DIR}/
COPY src/demo/source_code_server/login_component.py ${TFW_WEBIDE_WD}/
RUN chown -R ${AVATAO_USER} ${TFW_WEBIDE_WD} && chmod -R 755 ${TFW_WEBIDE_WD} RUN chown -R ${AVATAO_USER} ${TFW_WEBIDE_WD} && chmod -R 755 ${TFW_WEBIDE_WD}

0
src/event_handlers/source_code_event_handler.py → lib/tfw/components/source_code_event_handler.py
View File

7
src/event_handlers/terminado_event_handler.py → lib/tfw/components/terminado_event_handler.py
View File

@ -1,5 +1,3 @@
from shutil import rmtree, copytree
from tfw.event_handler_base import EventHandlerBase from tfw.event_handler_base import EventHandlerBase
from tfw.util import SupervisorMixin from tfw.util import SupervisorMixin
from tfw.config import tfwenv from tfw.config import tfwenv
@ -12,11 +10,6 @@ class TerminadoEventHandler(EventHandlerBase, SupervisorMixin):
super().__init__(anchor) super().__init__(anchor)
self.working_directory = tfwenv.TERMINADO_DIR self.working_directory = tfwenv.TERMINADO_DIR
self.process_name = process_name self.process_name = process_name
self.setup_terminado_server()
def setup_terminado_server(self):
rmtree(self.working_directory, ignore_errors=True)
copytree('terminado_server/', self.working_directory)
self.start_process() self.start_process()
def handle_event(self, anchor, data_json): def handle_event(self, anchor, data_json):

0
src/event_handlers/terminado_server/server.py → lib/tfw/components/terminado_mini_server.py
View File

0
src/app/app.py → src/demo/app.py
View File

4
src/event_handlers/event_handler_main.py → src/demo/event_handler_main.py
View File

@ -1,5 +1,5 @@
from source_code_event_handler import SourceCodeEventHandler from tfw.components.source_code_event_handler import SourceCodeEventHandler
from terminado_event_handler import TerminadoEventHandler from tfw.components.terminado_event_handler import TerminadoEventHandler
from tornado.ioloop import IOLoop from tornado.ioloop import IOLoop
from tfw.config import tfwenv from tfw.config import tfwenv

0
src/event_handlers/source_code_server/login_component.py → src/demo/source_code_server/login_component.py
View File

0
src/event_handlers/source_code_server/server.py → src/demo/source_code_server/server.py
View File

0
src/event_handlers/source_code_server/users.db → src/demo/source_code_server/users.db
View File

0
src/app/sql_injection_fsm.py → src/demo/sql_injection_fsm.py
View File

2
supervisor/components/event_handlers.conf
View File

@ -1,3 +1,3 @@
[program:event_handler_main] [program:event_handler_main]
directory=%(ENV_TFW_EVENT_HANDLERS_DIR)s directory=%(ENV_TFW_APP_DIR)s
command=env python event_handler_main.py command=env python event_handler_main.py

2
supervisor/components/terminado.conf
View File

@ -1,4 +1,4 @@
[program:terminado] [program:terminado]
directory=%(ENV_TFW_TERMINADO_DIR)s directory=%(ENV_TFW_TERMINADO_DIR)s
command=env python server.py command=env python terminado_mini_server.py
autostart=false autostart=false