Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
frozen
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CSE6
frozen
Commits
fad92bf2
Commit
fad92bf2
authored
2 years ago
by
Teemu Autto
Browse files
Options
Downloads
Patches
Plain Diff
Compatibility fixes.
parent
8d0e744f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.devcontainer/devcontainer.json
+3
-1
3 additions, 1 deletion
.devcontainer/devcontainer.json
docker-compose.yml
+1
-1
1 addition, 1 deletion
docker-compose.yml
pyproject.toml
+3
-2
3 additions, 2 deletions
pyproject.toml
with
7 additions
and
4 deletions
.devcontainer/devcontainer.json
+
3
−
1
View file @
fad92bf2
...
...
@@ -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"
,
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
1
−
1
View file @
fad92bf2
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
pyproject.toml
+
3
−
2
View file @
fad92bf2
...
...
@@ -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]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment