Merge pull request #23 from titanscouting/improve-devdocker

switch docker image to python:slim

Former-commit-id: 28b440725d338dd830ac9d3e0905eba54b05811f

.devcontainer/Dockerfile

@@ -1,7 +1,6 @@
-FROM ubuntu:20.04
+FROM python:slim
 WORKDIR /
-RUN apt-get -y update
+RUN apt-get -y update; apt-get -y upgrade
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
+RUN apt-get -y install git
-RUN apt-get install -y python3 python3-dev git python3-pip python3-kivy python-is-python3 libgl1-mesa-dev build-essential
+COPY requirements.txt .
-RUN ln -s $(which pip3) /usr/bin/pip
+RUN pip install -r requirements.txt
-RUN pip install pymongo pandas numpy scipy scikit-learn matplotlib pylint kivy

.devcontainer/dev-dockerfile

@@ -1,2 +0,0 @@
-FROM titanscout2022/tra-analysis-base:latest
-WORKDIR /

.devcontainer/devcontainer.json

@@ -1,23 +1,15 @@
 {
     "name": "TRA Analysis Development Environment",
     "build": {
-		"dockerfile": "dev-dockerfile",
+		"dockerfile": "Dockerfile",
     },
     "settings": { 
 		"terminal.integrated.shell.linux": "/bin/bash",
-		"python.pythonPath": "/usr/local/bin/python",
+		"python.pythonPath": "",
 		"python.linting.enabled": true,
 		"python.linting.pylintEnabled": true,
-		"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+		"python.linting.pylintPath": "",
-		"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+		"python.testing.pytestPath": "",
-		"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-		"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-		"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-		"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-		"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-		"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-		"python.linting.pylintPath": "/usr/local/bin/pylint",
-		"python.testing.pytestPath": "/usr/local/py-utils/bin/pytest",
     "editor.tabSize": 4,
     "editor.insertSpaces": false
 	},
@@ -26,5 +18,5 @@
 		"ms-python.python",
 		"waderyan.gitblame"
 	],
-		"postCreateCommand": "/usr/bin/pip3 install -r ${containerWorkspaceFolder}/src/requirements.txt && /usr/bin/pip3 install --no-cache-dir pylint && /usr/bin/pip3 install pytest"
+		"postCreateCommand": ""
 	}

.devcontainer/requirements.txt

@@ -1,19 +1,15 @@
-requests
-pymongo
-tra-analysis
-
-dnspython
-pyinstaller
-
-numpy
-scipy
-scikit-learn
-six
-pyparsing
-
-kivy==2.0.0rc2
-
-pyzmq
-python-daemon
-
 cerberus
+dnspython
+numpy
+pyinstaller
+pylint
+pymongo
+pyparsing
+pytest
+python-daemon
+pyzmq
+requests
+scikit-learn
+scipy
+six
+tra-analysis