From 02516b9ef261f4762901a100a3cace320a1a741a Mon Sep 17 00:00:00 2001 From: art Date: Sun, 5 Apr 2020 19:04:07 +0000 Subject: [PATCH 1/2] created dockerfiles --- .devcontainer/devcontainer.json | 22 +++++++++++++++++++ analysis-master/analysis-amd64/build.sh | 2 +- .../analysis-amd64/{ => docker}/Dockerfile | 3 +-- .../analysis-amd64/docker/Dockerfile-vscode | 3 +++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .devcontainer/devcontainer.json rename analysis-master/analysis-amd64/{ => docker}/Dockerfile (60%) create mode 100644 analysis-master/analysis-amd64/docker/Dockerfile-vscode diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..b0e78cc9 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,22 @@ +{ + "name": "TRA Analysis Development Environment", + "build": { + "dockerfile": "../analysis-master/analysis-amd64/docker/Dockerfile-vscode", + }, + "settings": { + "terminal.integrated.shell.linux": "/bin/bash", + "python.pythonPath": "/usr/local/bin/python", + "python.linting.enabled": true, + "python.linting.pylintEnabled": true, + "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8", + "python.formatting.blackPath": "/usr/local/py-utils/bin/black", + "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/py-utils/bin/pylint", + "python.testing.pytestPath": "/usr/local/py-utils/bin/pytest" + }, +} \ No newline at end of file diff --git a/analysis-master/analysis-amd64/build.sh b/analysis-master/analysis-amd64/build.sh index c6ac05d8..de0cce90 100644 --- a/analysis-master/analysis-amd64/build.sh +++ b/analysis-master/analysis-amd64/build.sh @@ -1 +1 @@ -python3 setup.py sdist bdist_wheel \ No newline at end of file +python setup.py sdist bdist_wheel || python3 setup.py sdist bdist_wheel \ No newline at end of file diff --git a/analysis-master/analysis-amd64/Dockerfile b/analysis-master/analysis-amd64/docker/Dockerfile similarity index 60% rename from analysis-master/analysis-amd64/Dockerfile rename to analysis-master/analysis-amd64/docker/Dockerfile index 10864dd2..b89cc8f2 100644 --- a/analysis-master/analysis-amd64/Dockerfile +++ b/analysis-master/analysis-amd64/docker/Dockerfile @@ -1,4 +1,3 @@ FROM python WORKDIR ~/ -COPY . . -RUN cd \ No newline at end of file +COPY .. . \ No newline at end of file diff --git a/analysis-master/analysis-amd64/docker/Dockerfile-vscode b/analysis-master/analysis-amd64/docker/Dockerfile-vscode new file mode 100644 index 00000000..d1d6748c --- /dev/null +++ b/analysis-master/analysis-amd64/docker/Dockerfile-vscode @@ -0,0 +1,3 @@ +FROM python +WORKDIR ~/ +# COPY . . \ No newline at end of file From 31e475e1d0470ce2484c4276b13df82450d11161 Mon Sep 17 00:00:00 2001 From: art Date: Sun, 5 Apr 2020 19:53:01 +0000 Subject: [PATCH 2/2] verified and tested docker files --- .devcontainer/Dockerfile | 2 ++ .devcontainer/devcontainer.json | 2 +- analysis-master/analysis-amd64/docker/Dockerfile | 3 ++- analysis-master/analysis-amd64/docker/Dockerfile-vscode | 3 --- analysis-master/analysis-amd64/docker/start-docker.sh | 3 +++ analysis-master/analysis-amd64/setup.py | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .devcontainer/Dockerfile delete mode 100644 analysis-master/analysis-amd64/docker/Dockerfile-vscode create mode 100755 analysis-master/analysis-amd64/docker/start-docker.sh 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",