diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..13e97cfc --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,2 @@ +FROM python +WORKDIR ~/ \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b0e78cc9..c5276a59 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ { "name": "TRA Analysis Development Environment", "build": { - "dockerfile": "../analysis-master/analysis-amd64/docker/Dockerfile-vscode", + "dockerfile": "Dockerfile", }, "settings": { "terminal.integrated.shell.linux": "/bin/bash", diff --git a/analysis-master/analysis-amd64/docker/Dockerfile b/analysis-master/analysis-amd64/docker/Dockerfile index b89cc8f2..b00c4b65 100644 --- a/analysis-master/analysis-amd64/docker/Dockerfile +++ b/analysis-master/analysis-amd64/docker/Dockerfile @@ -1,3 +1,4 @@ FROM python WORKDIR ~/ -COPY .. . \ No newline at end of file +COPY ./ ./ +CMD ["bash"] \ No newline at end of file diff --git a/analysis-master/analysis-amd64/docker/Dockerfile-vscode b/analysis-master/analysis-amd64/docker/Dockerfile-vscode deleted file mode 100644 index d1d6748c..00000000 --- a/analysis-master/analysis-amd64/docker/Dockerfile-vscode +++ /dev/null @@ -1,3 +0,0 @@ -FROM python -WORKDIR ~/ -# COPY . . \ No newline at end of file diff --git a/analysis-master/analysis-amd64/docker/start-docker.sh b/analysis-master/analysis-amd64/docker/start-docker.sh new file mode 100755 index 00000000..baf16097 --- /dev/null +++ b/analysis-master/analysis-amd64/docker/start-docker.sh @@ -0,0 +1,3 @@ +cd .. +docker build -t tra-analysis-amd64-dev -f docker/Dockerfile . +docker run -it tra-analysis-amd64-dev \ No newline at end of file diff --git a/analysis-master/analysis-amd64/setup.py b/analysis-master/analysis-amd64/setup.py index 8dfabc00..0fa8c9d8 100644 --- a/analysis-master/analysis-amd64/setup.py +++ b/analysis-master/analysis-amd64/setup.py @@ -1,7 +1,7 @@ import setuptools setuptools.setup( - name="analysis" + name="analysis", version="1.0.0.009", author="The Titan Scouting Team", author_email="titanscout2022@gmail.com",