diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6f33be1c9e04ef32ff809f8491c83b4801252b08..381addad5fc3aaf1f924d46be97a7ae3dd17ed58 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ // Use docker-compose to setup the container // https://code.visualstudio.com/docs/containers/docker-compose "dockerComposeFile": "../docker-compose.yml", - "service": "tjts5901-dev", + "service": "tjts5901", // Don't start flask app by default. "overrideCommand": true, @@ -27,6 +27,8 @@ "workspaceFolder": "/app", "mounts": [ + // Mount the local folder into the container + "source=${localWorkspaceFolder},target=/app,type=bind,consistency=cached", // Setup mountpoints for accessing secrets and services in host machine // Docker-from-Docker, see https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker.md "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind", diff --git a/docker-compose.yml b/docker-compose.yml index e7f0d3479c5282e1809e9867c1fd79829fb21789..1334aa67ebbcbfb174b12934f9ff8c671713f60d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: #- .:/app:cached # Include system timezone information, so container doesn't use UTC #- /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro + #- /etc/localtime:/etc/localtime:ro environment: #- FLASK_APP=tjt5901:app diff --git a/pyproject.toml b/pyproject.toml index 07956311b46e14a6bf4768b5bfb21cb7f9f92350..04977512e621dbf3ae91e5d5cee891cfd0df63f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,13 +15,14 @@ [project] name = "tjts5901" description = "TJTS5901 Course work assigment" +version = "0.0.1" authors = [ { name="University of Jyväskylä" }, # { name="Team Member", email="team.member@student.jyu.fi" } ] # Version is detected from git, and dependencies from older style "requirements.txt" file. -dynamic = ["version", "dependencies"] +dynamic = ["dependencies"] [tool.setuptools.dynamic] dependencies = {file = ["requirements.txt"]} @@ -37,7 +38,7 @@ docs = [ ] [build-system] -requires = ["setuptools>=61.0", "setuptools_scm[toml]>=5"] +requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [tool.setuptools_scm]