From fad92bf28c2165dd97819f5f1da3a25f470f7805 Mon Sep 17 00:00:00 2001
From: Teemu Autto <teemu.a.autto@jyu.fi>
Date: Mon, 9 Jan 2023 14:21:10 +0000
Subject: [PATCH] Compatibility fixes.

---
 .devcontainer/devcontainer.json | 4 +++-
 docker-compose.yml              | 2 +-
 pyproject.toml                  | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6f33be1c..381addad 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 e7f0d347..1334aa67 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 07956311..04977512 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]
-- 
GitLab