diff --git a/docker/sqkserver/Dockerfile b/docker/sqkserver/Dockerfile index 9dfe5cf4..b9e5c623 100644 --- a/docker/sqkserver/Dockerfile +++ b/docker/sqkserver/Dockerfile @@ -19,12 +19,14 @@ WORKDIR /app RUN git clone https://github.com/googleapis/googleapis.git # Copy the source code. -COPY squeakserver ./squeakserver -COPY proto ./proto -COPY setup.py setup.cfg MANIFEST.in README.md ./ +COPY . ./ + +# COPY proto files +RUN cp -r proto/ squeakserver/proto # Copy the frontend build -COPY frontend/squeak-node-frontend/build/ ./static/build +RUN mkdir ./static && \ + cp -r frontend/squeak-node-frontend/build/ ./static/build RUN python3 setup.py install diff --git a/squeakserver/admin/webapp/app.py b/squeakserver/admin/webapp/app.py index 625ef334..3742af0b 100644 --- a/squeakserver/admin/webapp/app.py +++ b/squeakserver/admin/webapp/app.py @@ -28,9 +28,9 @@ logger = logging.getLogger(__name__) def create_app(handler, username, password): # create and configure the app logger.info("Starting flask app from directory: {}".format(os.getcwd())) - root_path = 'squeakserver/admin/webapp' + # root_path = 'squeakserver/admin/webapp' # root_path = os.path.dirname(os.path.realpath(__file__)) - logger.info("Starting flask with root_path: {}".format(root_path)) + #logger.info("Starting flask with root_path: {}".format(root_path)) # readme = open("README.md", "r").read() # logger.info("Starting flask with README: {}".format(readme)) # base_template = open("squeakserver/admin/webapp/templates/base.html", "r").read() @@ -39,8 +39,8 @@ def create_app(handler, username, password): __name__, static_folder='/app/static/build', static_url_path='/', - template_folder='templates', - root_path=root_path, + # template_folder='templates', + # root_path=root_path, ) app.config.from_mapping( SECRET_KEY='dev', diff --git a/squeakserver/proto/__init__.py b/squeakserver/proto/__init__.py new file mode 100644 index 00000000..e69de29b