diff --git a/Dockerfile b/Dockerfile index 57e4ec4..163233c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9.13 +FROM python:3.10 WORKDIR /app @@ -14,7 +14,7 @@ ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt ENV SSL_CERT_DIR=/etc/ssl/certs/ # Install server dependencies -RUN apt update && apt install -y \ +RUN apt-get update && apt-get install -y \ build-essential \ gcc \ libpq-dev \ @@ -23,7 +23,9 @@ RUN apt update && apt install -y \ # Install python dependencies RUN pip install --upgrade pip setuptools wheel -# RUN pip install spinetoolbox==0.7.4 --verbose -RUN pip install PySide6==6.5.2 spinetoolbox==0.7.4 +RUN pip install --no-deps \ + spinetoolbox==0.7.4 \ + spine_engine==0.23.4 +RUN pip install -r requirements.txt -ENTRYPOINT [ "python", "src/app.py" ] \ No newline at end of file +# ENTRYPOINT ["python", "src/app.py" ] \ No newline at end of file diff --git a/Makefile b/Makefile index 70d8f43..7332259 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,10 @@ export help: @egrep "^# target:" [Mm]akefile +# target: build - Build the docker image. +build: + docker compose build --no-cache + # target: run - Run local web server. run: python src/app.py \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 21f6083..3f3179a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,13 +4,13 @@ services: context: . ports: - 5000:5000 - db: - image: postgres:16 - env_file: .env - ports: - - 5432:5432 - volumes: - - pgdata:/var/lib/postgresql/data +# db: +# image: postgres:16 +# env_file: .env +# ports: +# - 5432:5432 +# volumes: +# - pgdata:/var/lib/postgresql/data -volumes: - pgdata: +# volumes: +# pgdata: diff --git a/requirements.txt b/requirements.txt index c14ce0f..03fc559 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,19 @@ +dagster==1.7.16 flask==2.3.3 -# flask_oidc -# jill -# okta -# pytest -sqlalchemy -spinetoolbox==0.7.4 -# -e git+https://github.com/spine-tools/spine-engine.git@7be63302466f2826ab80ffa0730e31a052770fc4#egg=spine_engine -# -e git+https://github.com/spine-tools/spine-items.git@f08c405fdcc4effc36da93d96239caf211718e92#egg=spine_items -# -e git+https://github.com/spine-tools/Spine-Database-API.git@c147f787f314413356ce3a59cf608d6bbcd4bfa4#egg=spinedb_api -# -e git+https://github.com/Spine-project/Spine-Toolbox.git@ee6c75e046f38f09e43314da9dfcf5bca8303d4a#egg=spinetoolbox \ No newline at end of file +flask_oidc==1.4.0 +jill==0.11.5 +jupyter-client>=6.0 +matplotlib>= 3.5 +networkx>=2.6 +numpy==1.26.4 +okta==2.9.5 +pygments>=2.8 +pytest +spine_items==0.21.5 +spinedb_api==0.30.5 +pandas>=1.3.2 +pyzmq >=21.0 +pyside6==6.6.3.1 +qtconsole>=5.1 +scipy>=1.7.1 +sqlalchemy>=1.3