diff --git a/fluent-env/Dockerfile b/fluent-env/Dockerfile index eaff4cc..4332e07 100644 --- a/fluent-env/Dockerfile +++ b/fluent-env/Dockerfile @@ -40,7 +40,9 @@ RUN cp ~/.cargo/git/checkouts/fluent_cli-*/*/amber.yaml /.fluent/ RUN cp ~/.cargo/git/checkouts/fluent_cli-*/*/fluent-env/start-neo4j.sh /.fluent/ RUN chmod +x /.fluent/start-neo4j.sh RUN cp ~/.cargo/git/checkouts/fluent_cli-*/*/fluent-env/start-flask.sh /.fluent/ -RUN chmod +x /.fluent/start-flash.sh +RUN chmod +x /.fluent/start-flask.sh +RUN cp ~/.cargo/git/checkouts/fluent_cli-*/*/fluent-env/start-combined.sh /.fluent/ +RUN chmod +x /.fluent/start-combined.sh RUN cp ~/.cargo/git/checkouts/fluent_cli-*/*/example_configurations/*.json /.fluent/example_configurations @@ -57,8 +59,10 @@ RUN echo "dbms.default_listen_address=0.0.0.0" >> /etc/neo4j/neo4j.conf RUN neo4j-admin set-default-admin neo4j RUN neo4j-admin set-initial-password system2024! -CMD ["/.fluent/start-neo4j.sh"] -CMD ["/.fluent/start-flask.sh"] + +#CMD ["/.fluent/start-neo4j.sh"] +#CMD ["/.fluent/start-flask.sh"] +CMD ["/.fluent/start-combined.sh"] #CMD ["python", "app.py", "&"] #RUN python -m flask run --host=0.0.0.0 --port=5000 & #CMD ["python3", "app.py"] diff --git a/fluent-env/start-combined.sh b/fluent-env/start-combined.sh new file mode 100644 index 0000000..0ed7ad5 --- /dev/null +++ b/fluent-env/start-combined.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# Start Neo4j in the background +neo4j start & + +screen -d -m flask python /app/app.py + +echo "started neo4j and web server" \ No newline at end of file