From fe1068882e2c7d0b8f095cf515eee6b8a04730c4 Mon Sep 17 00:00:00 2001 From: Artem Veremey Date: Tue, 29 Mar 2022 14:44:44 -0700 Subject: [PATCH] Updating and renaming Docker images (#1594) * Updating and renaming Docker images * Renaming OpenBB Terminal.bat --- .gitignore | 1 + Gamestonk Terminal.bat => OpenBB Terminal.bat | 2 +- docker/compose.env | 32 ++++---- docker/docker-compose.yaml | 78 +++++++++---------- docker/entry-point-poetry-jupyter.sh | 2 +- docker/extension.sh | 8 +- docker/gst-deps.dockerfile | 7 -- docker/gst-poetry-deps.dockerfile | 10 --- docker/gst-poetry-full-deps.dockerfile | 6 -- docker/gst-poetry-full.dockerfile | 7 -- docker/gst-poetry-jupyter.dockerfile | 14 ---- docker/gst-poetry.dockerfile | 7 -- docker/gst.dockerfile | 7 -- docker/openbbterminal-deps.dockerfile | 9 +++ docker/openbbterminal-poetry-deps.dockerfile | 12 +++ ...openbbterminal-poetry-full-deps.dockerfile | 8 ++ docker/openbbterminal-poetry-full.dockerfile | 9 +++ .../openbbterminal-poetry-jupyter.dockerfile | 14 ++++ docker/openbbterminal-poetry.dockerfile | 9 +++ ...rfile => openbbterminal-python.dockerfile} | 2 +- docker/openbbterminal.dockerfile | 7 ++ openbb_terminal/README.md | 12 +-- 22 files changed, 137 insertions(+), 126 deletions(-) rename Gamestonk Terminal.bat => OpenBB Terminal.bat (75%) delete mode 100644 docker/gst-deps.dockerfile delete mode 100644 docker/gst-poetry-deps.dockerfile delete mode 100644 docker/gst-poetry-full-deps.dockerfile delete mode 100644 docker/gst-poetry-full.dockerfile delete mode 100644 docker/gst-poetry-jupyter.dockerfile delete mode 100644 docker/gst-poetry.dockerfile delete mode 100644 docker/gst.dockerfile create mode 100644 docker/openbbterminal-deps.dockerfile create mode 100644 docker/openbbterminal-poetry-deps.dockerfile create mode 100644 docker/openbbterminal-poetry-full-deps.dockerfile create mode 100644 docker/openbbterminal-poetry-full.dockerfile create mode 100644 docker/openbbterminal-poetry-jupyter.dockerfile create mode 100644 docker/openbbterminal-poetry.dockerfile rename docker/{gst-python.dockerfile => openbbterminal-python.dockerfile} (88%) create mode 100644 docker/openbbterminal.dockerfile diff --git a/.gitignore b/.gitignore index 17f42598a3f..02de52c2842 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ env/ venv/ !notebooks/jupyter/.gitkeep .python-version +.mypy_cache iframe_figures/ exports/* .idea diff --git a/Gamestonk Terminal.bat b/OpenBB Terminal.bat similarity index 75% rename from Gamestonk Terminal.bat rename to OpenBB Terminal.bat index 0c4431f6934..9178cd303a9 100644 --- a/Gamestonk Terminal.bat +++ b/OpenBB Terminal.bat @@ -1,6 +1,6 @@ @echo off call %UserProfile%/anaconda3/Scripts/activate.bat call conda activate gst -cd "%UserProfile%\GamestonkTerminal" +cd "%UserProfile%\OpenBBTerminal" call python terminal.py pause diff --git a/docker/compose.env b/docker/compose.env index 03f913ce6bf..ea4d8775faf 100644 --- a/docker/compose.env +++ b/docker/compose.env @@ -1,17 +1,17 @@ -GST_DOCKER_IMAGE_PREFIX="ghcr.io/gamestonkterminal" -GST_DOCKER_PYTHON_VERSION="1.5.0" -GST_DOCKER_DEPS_VERSION="1.8.0" -GST_DOCKER_POETRY_DEPS_VERSION="1.8.0" -GST_DOCKER_POETRY_FULL_DEPS_VERSION="1.8.0" -GST_DOCKER_GST_VERSION="1.8.0" -GST_DOCKER_POETRY_VERSION="1.8.0" -GST_DOCKER_POETRY_FULL_VERSION="1.8.0" +OPENBBTERMINAL_DOCKER_IMAGE_PREFIX="ghcr.io/openbb-finance" +OPENBBTERMINAL_DOCKER_PYTHON_VERSION="1.0.0" +OPENBBTERMINAL_DOCKER_DEPS_VERSION="1.0.0" +OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION="1.0.0" +OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION="1.0.0" +OPENBBTERMINAL_DOCKER_OPENBBTERMINAL_VERSION="1.0.0" +OPENBBTERMINAL_DOCKER_POETRY_VERSION="1.0.0" +OPENBBTERMINAL_DOCKER_POETRY_FULL_VERSION="1.0.0" -export GST_DOCKER_IMAGE_PREFIX -export GST_DOCKER_PYTHON_VERSION -export GST_DOCKER_DEPS_VERSION -export GST_DOCKER_POETRY_DEPS_VERSION -export GST_DOCKER_POETRY_FULL_DEPS_VERSION -export GST_DOCKER_GST_VERSION -export GST_DOCKER_POETRY_VERSION -export GST_DOCKER_POETRY_FULL_VERSION +export OPENBBTERMINAL_DOCKER_IMAGE_PREFIX +export OPENBBTERMINAL_DOCKER_PYTHON_VERSION +export OPENBBTERMINAL_DOCKER_DEPS_VERSION +export OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION +export OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION +export OPENBBTERMINAL_DOCKER_OPENBBTERMINAL_VERSION +export OPENBBTERMINAL_DOCKER_POETRY_VERSION +export OPENBBTERMINAL_DOCKER_POETRY_FULL_VERSION diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 3a311ee86be..b2b61dd4a3a 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -1,72 +1,72 @@ version: '3.8' services: - gst-python: + openbbterminal-python: build: context: .. - dockerfile: docker/gst-python.dockerfile - image: "${GST_DOCKER_IMAGE_PREFIX}/gst-python:${GST_DOCKER_PYTHON_VERSION}" - gst-deps: + dockerfile: docker/openbbterminal-python.dockerfile + image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-python:${OPENBBTERMINAL_DOCKER_PYTHON_VERSION}" + openbbterminal-deps: build: context: .. - dockerfile: docker/gst-deps.dockerfile + dockerfile: docker/openbbterminal-deps.dockerfile args: - GST_DOCKER_IMAGE_PREFIX: ${GST_DOCKER_IMAGE_PREFIX} - GST_DOCKER_PYTHON_VERSION: ${GST_DOCKER_PYTHON_VERSION} - image: "${GST_DOCKER_IMAGE_PREFIX}/gst-deps:${GST_DOCKER_DEPS_VERSION}" - gst-poetry-deps: + OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX} + OPENBBTERMINAL_DOCKER_PYTHON_VERSION: ${OPENBBTERMINAL_DOCKER_PYTHON_VERSION} + image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-deps:${OPENBBTERMINAL_DOCKER_DEPS_VERSION}" + openbbterminal-poetry-deps: build: context: .. - dockerfile: docker/gst-poetry-deps.dockerfile + dockerfile: docker/openbbterminal-poetry-deps.dockerfile args: - GST_DOCKER_IMAGE_PREFIX: ${GST_DOCKER_IMAGE_PREFIX} - GST_DOCKER_PYTHON_VERSION: ${GST_DOCKER_PYTHON_VERSION} - image: "${GST_DOCKER_IMAGE_PREFIX}/gst-poetry-deps:${GST_DOCKER_POETRY_DEPS_VERSION}" - gst-poetry-full-deps: + OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX} + OPENBBTERMINAL_DOCKER_PYTHON_VERSION: ${OPENBBTERMINAL_DOCKER_PYTHON_VERSION} + image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-deps:${OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION}" + openbbterminal-poetry-full-deps: build: context: .. - dockerfile: docker/gst-poetry-full-deps.dockerfile + dockerfile: docker/openbbterminal-poetry-full-deps.dockerfile args: - GST_DOCKER_IMAGE_PREFIX: ${GST_DOCKER_IMAGE_PREFIX} - GST_DOCKER_PYTHON_VERSION: ${GST_DOCKER_PYTHON_VERSION} - GST_DOCKER_POETRY_DEPS_VERSION: ${GST_DOCKER_POETRY_DEPS_VERSION} - image: "${GST_DOCKER_IMAGE_PREFIX}/gst-poetry-full-deps:${GST_DOCKER_POETRY_FULL_DEPS_VERSION}" - gst: + OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX} + OPENBBTERMINAL_DOCKER_PYTHON_VERSION: ${OPENBBTERMINAL_DOCKER_PYTHON_VERSION} + OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION: ${OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION} + image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-full-deps:${OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION}" + openbbterminal: build: context: .. - dockerfile: docker/gst.dockerfile + dockerfile: docker/openbbterminal.dockerfile args: - GST_DOCKER_IMAGE_PREFIX: ${GST_DOCKER_IMAGE_PREFIX} - GST_DOCKER_DEPS_VERSION: ${GST_DOCKER_DEPS_VERSION} - image: "${GST_DOCKER_IMAGE_PREFIX}/gst:${GST_DOCKER_GST_VERSION}" + OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX} + OPENBBTERMINAL_DOCKER_DEPS_VERSION: ${OPENBBTERMINAL_DOCKER_DEPS_VERSION} + image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal:${OPENBBTERMINAL_DOCKER_OPENBBTERMINAL_VERSION}" tty: true env_file: setenv - gst-poetry: + openbbterminal-poetry: build: context: .. - dockerfile: docker/gst-poetry.dockerfile + dockerfile: docker/openbbterminal-poetry.dockerfile args: - GST_DOCKER_IMAGE_PREFIX: ${GST_DOCKER_IMAGE_PREFIX} - GST_DOCKER_POETRY_DEPS_VERSION: ${GST_DOCKER_POETRY_DEPS_VERSION} - image: "${GST_DOCKER_IMAGE_PREFIX}/gst-poetry:${GST_DOCKER_POETRY_VERSION}" + OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX} + OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION: ${OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION} + image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry:${OPENBBTERMINAL_DOCKER_POETRY_VERSION}" tty: true env_file: setenv - gst-poetry-jupyter: + openbbterminal-poetry-jupyter: build: context: .. - dockerfile: docker/gst-poetry-jupyter.dockerfile + dockerfile: docker/openbbterminal-poetry-jupyter.dockerfile args: - GST_DOCKER_IMAGE_PREFIX: ${GST_DOCKER_IMAGE_PREFIX} - GST_DOCKER_POETRY_FULL_DEPS_VERSION: ${GST_DOCKER_POETRY_FULL_DEPS_VERSION} - image: "${GST_DOCKER_IMAGE_PREFIX}/gst-poetry-jupyter:${GST_DOCKER_POETRY_VERSION}" + OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX} + OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION: ${OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION} + image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-jupyter:${OPENBBTERMINAL_DOCKER_POETRY_VERSION}" tty: true env_file: setenv - gst-poetry-full: + openbbterminal-poetry-full: build: context: .. - dockerfile: docker/gst-poetry-full.dockerfile + dockerfile: docker/openbbterminal-poetry-full.dockerfile args: - GST_DOCKER_IMAGE_PREFIX: ${GST_DOCKER_IMAGE_PREFIX} - GST_DOCKER_POETRY_FULL_DEPS_VERSION: ${GST_DOCKER_POETRY_FULL_DEPS_VERSION} - image: "${GST_DOCKER_IMAGE_PREFIX}/gst-poetry-full:${GST_DOCKER_POETRY_FULL_VERSION}" + OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX} + OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION: ${OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION} + image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-full:${OPENBBTERMINAL_DOCKER_POETRY_FULL_VERSION}" tty: true env_file: setenv diff --git a/docker/entry-point-poetry-jupyter.sh b/docker/entry-point-poetry-jupyter.sh index 5c69edc0f0a..af17da7091e 100644 --- a/docker/entry-point-poetry-jupyter.sh +++ b/docker/entry-point-poetry-jupyter.sh @@ -1,7 +1,7 @@ #!/bin/bash source $(poetry env info --path)/bin/activate -#export PS1="(gst) > " +#export PS1="(OPENBBTERMINAL_) > " # stty erase ^h jupyter lab --ip=0.0.0.0 #poetry run python terminal.py diff --git a/docker/extension.sh b/docker/extension.sh index 69506602413..55fb9a92473 100644 --- a/docker/extension.sh +++ b/docker/extension.sh @@ -2,9 +2,9 @@ source $(poetry env info --path)/bin/activate -pip install -e jupyterlab/gst -pip install -e jupyterlab/gst-settings +pip install -e jupyterlab/openbb +pip install -e jupyterlab/openbbterminal-settings pip install -e jupyterlab/documentation -jupyter-labextension install jupyterlab/gst -jupyter-labextension install jupyterlab/gst-settings +jupyter-labextension install jupyterlab/openbb +jupyter-labextension install jupyterlab/openbb-settings jupyter-labextension install jupyterlab/documentation diff --git a/docker/gst-deps.dockerfile b/docker/gst-deps.dockerfile deleted file mode 100644 index 38409c0e5b2..00000000000 --- a/docker/gst-deps.dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -ARG GST_DOCKER_IMAGE_PREFIX="ghcr.io/gamestonkterminal" -ARG GST_DOCKER_PYTHON_VERSION="1.0.0" -FROM ${GST_DOCKER_IMAGE_PREFIX}/gst-python:${GST_DOCKER_PYTHON_VERSION} - -COPY --chown=python:python requirements.txt /home/python/ - -RUN pip install -r requirements.txt diff --git a/docker/gst-poetry-deps.dockerfile b/docker/gst-poetry-deps.dockerfile deleted file mode 100644 index a21df6f51e2..00000000000 --- a/docker/gst-poetry-deps.dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -ARG GST_DOCKER_IMAGE_PREFIX="ghcr.io/gamestonkterminal" -ARG GST_DOCKER_PYTHON_VERSION="1.0.0" -FROM ${GST_DOCKER_IMAGE_PREFIX}/gst-python:${GST_DOCKER_PYTHON_VERSION} - -COPY --chown=python:python pyproject.toml poetry.lock /home/python/ - -RUN mkdir /home/python/openbb_terminal && \ - touch openbb_terminal/__init__.py && \ - chown python:python /home/python/openbb_terminal /home/python/openbb_terminal/__init__.py && \ - poetry install diff --git a/docker/gst-poetry-full-deps.dockerfile b/docker/gst-poetry-full-deps.dockerfile deleted file mode 100644 index 38299fc3f84..00000000000 --- a/docker/gst-poetry-full-deps.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -ARG GST_DOCKER_IMAGE_PREFIX="ghcr.io/gamestonkterminal" -ARG GST_DOCKER_POETRY_DEPS_VERSION="1.2.0" -FROM ${GST_DOCKER_IMAGE_PREFIX}/gst-poetry-deps:${GST_DOCKER_POETRY_DEPS_VERSION} - -RUN cd /home/python/openbb_terminal && \ - poetry install -E prediction diff --git a/docker/gst-poetry-full.dockerfile b/docker/gst-poetry-full.dockerfile deleted file mode 100644 index baaa2527ba9..00000000000 --- a/docker/gst-poetry-full.dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -ARG GST_DOCKER_IMAGE_PREFIX="ghcr.io/gamestonkterminal" -ARG GST_DOCKER_POETRY_FULL_DEPS_VERSION="1.2.0" -FROM ${GST_DOCKER_IMAGE_PREFIX}/gst-poetry-full-deps:${GST_DOCKER_POETRY_FULL_DEPS_VERSION} - -COPY --chown=python:python . . - -CMD ["bash", "docker/entry-point-poetry.sh"] diff --git a/docker/gst-poetry-jupyter.dockerfile b/docker/gst-poetry-jupyter.dockerfile deleted file mode 100644 index c2f7a56846f..00000000000 --- a/docker/gst-poetry-jupyter.dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -ARG GST_DOCKER_IMAGE_PREFIX="ghcr.io/gamestonkterminal" -ARG GST_DOCKER_POETRY_FULL_DEPS_VERSION="1.2.0" -FROM ${GST_DOCKER_IMAGE_PREFIX}/gst-poetry-full-deps:${GST_DOCKER_POETRY_FULL_DEPS_VERSION} - -LABEL org.opencontainers.image.source https://github.com/GamestonkTerminal/GamestonkTerminal - -EXPOSE 8888 - -COPY --chown=python:python . . - -RUN cp docker/lab-settings.json jupyterlab/gst-settings/schema/settings.json && \ - bash -x docker/extension.sh - -CMD ["bash", "docker/entry-point-poetry-jupyter.sh"] diff --git a/docker/gst-poetry.dockerfile b/docker/gst-poetry.dockerfile deleted file mode 100644 index f00ff7de22f..00000000000 --- a/docker/gst-poetry.dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -ARG GST_DOCKER_IMAGE_PREFIX="ghcr.io/gamestonkterminal" -ARG GST_DOCKER_POETRY_DEPS_VERSION="1.2.0" -FROM ${GST_DOCKER_IMAGE_PREFIX}/gst-poetry-deps:${GST_DOCKER_POETRY_DEPS_VERSION} - -COPY --chown=python:python . . - -CMD ["bash", "docker/entry-point-poetry.sh"] diff --git a/docker/gst.dockerfile b/docker/gst.dockerfile deleted file mode 100644 index 4b58e291045..00000000000 --- a/docker/gst.dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -ARG GST_DOCKER_IMAGE_PREFIX="ghcr.io/gamestonkterminal" -ARG GST_DOCKER_DEPS_VERSION="1.2.0" -FROM ${GST_DOCKER_IMAGE_PREFIX}/gst-deps:${GST_DOCKER_DEPS_VERSION} - -COPY --chown=python:python . . - -CMD ["bash", "docker/entry-point.sh"] diff --git a/docker/openbbterminal-deps.dockerfile b/docker/openbbterminal-deps.dockerfile new file mode 100644 index 00000000000..fabbbe09077 --- /dev/null +++ b/docker/openbbterminal-deps.dockerfile @@ -0,0 +1,9 @@ +ARG OPENBBTERMINAL_DOCKER_IMAGE_PREFIX="ghcr.io/openbb-finance" +ARG OPENBBTERMINAL_DOCKER_PYTHON_VERSION="1.0.0" +FROM ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-python:${OPENBBTERMINAL_DOCKER_PYTHON_VERSION} + +LABEL org.opencontainers.image.source https://github.com/OpenBB-finance/OpenBBTerminal + +COPY --chown=python:python requirements.txt /home/python/ + +RUN pip install -r requirements.txt diff --git a/docker/openbbterminal-poetry-deps.dockerfile b/docker/openbbterminal-poetry-deps.dockerfile new file mode 100644 index 00000000000..84ee9325ff2 --- /dev/null +++ b/docker/openbbterminal-poetry-deps.dockerfile @@ -0,0 +1,12 @@ +ARG OPENBBTERMINAL_DOCKER_IMAGE_PREFIX="ghcr.io/openbb-finance" +ARG OPENBBTERMINAL_DOCKER_PYTHON_VERSION="1.0.0" +FROM ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-python:${OPENBBTERMINAL_DOCKER_PYTHON_VERSION} + +LABEL org.opencontainers.image.source https://github.com/OpenBB-finance/OpenBBTerminal + +COPY --chown=python:python pyproject.toml poetry.lock /home/python/ + +RUN mkdir /home/python/openbb_terminal && \ + touch openbb_terminal/__init__.py && \ + chown python:python /home/python/openbb_terminal /home/python/openbb_terminal/__init__.py && \ + poetry install diff --git a/docker/openbbterminal-poetry-full-deps.dockerfile b/docker/openbbterminal-poetry-full-deps.dockerfile new file mode 100644 index 00000000000..30866506605 --- /dev/null +++ b/docker/openbbterminal-poetry-full-deps.dockerfile @@ -0,0 +1,8 @@ +ARG OPENBBTERMINAL_DOCKER_IMAGE_PREFIX="ghcr.io/openbb-finance" +ARG OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION="1.2.0" +FROM ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-deps:${OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION} + +LABEL org.opencontainers.image.source https://github.com/OpenBB-finance/OpenBBTerminal + +RUN cd /home/python/openbb_terminal && \ + poetry install -E prediction diff --git a/docker/openbbterminal-poetry-full.dockerfile b/docker/openbbterminal-poetry-full.dockerfile new file mode 100644 index 00000000000..8d79418a248 --- /dev/null +++ b/docker/openbbterminal-poetry-full.dockerfile @@ -0,0 +1,9 @@ +ARG OPENBBTERMINAL_DOCKER_IMAGE_PREFIX="ghcr.io/openbb-finance" +ARG OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION="1.2.0" +FROM ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-full-deps:${OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION} + +LABEL org.opencontainers.image.source https://github.com/OpenBB-finance/OpenBBTerminal + +COPY --chown=python:python . . + +CMD ["bash", "docker/entry-point-poetry.sh"] diff --git a/docker/openbbterminal-poetry-jupyter.dockerfile b/docker/openbbterminal-poetry-jupyter.dockerfile new file mode 100644 index 00000000000..aa2c6e583a3 --- /dev/null +++ b/docker/openbbterminal-poetry-jupyter.dockerfile @@ -0,0 +1,14 @@ +ARG OPENBBTERMINAL_DOCKER_IMAGE_PREFIX="ghcr.io/openbb-finance" +ARG OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION="1.2.0" +FROM ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-full-deps:${OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION} + +LABEL org.opencontainers.image.source https://github.com/OpenBB-finance/OpenBBTerminal + +EXPOSE 8888 + +COPY --chown=python:python . . + +RUN cp docker/lab-settings.json jupyterlab/openbb-settings/schema/settings.json && \ + bash -x docker/extension.sh + +CMD ["bash", "docker/entry-point-poetry-jupyter.sh"] diff --git a/docker/openbbterminal-poetry.dockerfile b/docker/openbbterminal-poetry.dockerfile new file mode 100644 index 00000000000..f65f53257c9 --- /dev/null +++ b/docker/openbbterminal-poetry.dockerfile @@ -0,0 +1,9 @@ +ARG OPENBBTERMINAL_DOCKER_IMAGE_PREFIX="ghcr.io/openbb-finance" +ARG OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION="1.2.0" +FROM ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-deps:${OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION} + +LABEL org.opencontainers.image.source https://github.com/OpenBB-finance/OpenBBTerminal + +COPY --chown=python:python . . + +CMD ["bash", "docker/entry-point-poetry.sh"] diff --git a/docker/gst-python.dockerfile b/docker/openbbterminal-python.dockerfile similarity index 88% rename from docker/gst-python.dockerfile rename to docker/openbbterminal-python.dockerfile index bf139690fe2..eecfead8c18 100644 --- a/docker/gst-python.dockerfile +++ b/docker/openbbterminal-python.dockerfile @@ -1,6 +1,6 @@ FROM python:3.8-slim-buster -LABEL org.opencontainers.image.source https://github.com/GamestonkTerminal/GamestonkTerminal +LABEL org.opencontainers.image.source https://github.com/OpenBB-finance/OpenBBTerminal RUN apt-get update && apt-get -y install --no-install-recommends \ gcc \ diff --git a/docker/openbbterminal.dockerfile b/docker/openbbterminal.dockerfile new file mode 100644 index 00000000000..e016db26a26 --- /dev/null +++ b/docker/openbbterminal.dockerfile @@ -0,0 +1,7 @@ +ARG OPENBBTERMINAL_DOCKER_IMAGE_PREFIX="ghcr.io/openbb-finance" +ARG OPENBBTERMINAL_DOCKER_DEPS_VERSION="1.2.0" +FROM ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-deps:${OPENBBTERMINAL_DOCKER_DEPS_VERSION} + +COPY --chown=python:python . . + +CMD ["bash", "docker/entry-point.sh"] diff --git a/openbb_terminal/README.md b/openbb_terminal/README.md index 9c1c553ebb0..d26d0c07e78 100644 --- a/openbb_terminal/README.md +++ b/openbb_terminal/README.md @@ -178,7 +178,7 @@ Anaconda's Python distribution. 9. (Windows - Optional and **only if you are not using WSL**) Speeding up opening process in the future - After you've installed OpenBB Terminal, you'll find a file named "Gamestonk Terminal.bat". You can use this file + After you've installed OpenBB Terminal, you'll find a file named "OpenBB Terminal.bat". You can use this file to open OpenBB Terminal quicker. This file can be moved to your desktop if you'd like. If you run into issues while trying to run the batch file. If you run into issues with the batch files, edit the file and check to see if the directories match up. This file assumes you used the default directories when installing. @@ -239,7 +239,7 @@ git stash Then, re-run `poetry install` or `pip install -r requirements.txt` to get any new dependencies. -Once installation is finished, you're ready to gamestonk. +Once installation is finished, you're ready to openbb. If you `stashed` your changes previously, you can un-stash them with: @@ -264,7 +264,7 @@ git stash pop 2. Download the latest docker image. ```bash - docker pull ghcr.io/gamestonkterminal/gst-poetry:latest + docker pull ghcr.io/openbb-finance/openbbterminal-poetry:latest ``` Upon running this the first time, you should see the various layers downloading (note the random series of letters numbers will vary). The first time this is run, it will take a few minutes. Subsequent updates will be much faster, as the changes will be in the MB instead of GB. @@ -276,14 +276,14 @@ git stash pop ```text REPOSITORY TAG IMAGE ID CREATED SIZE - ghcr.io/gamestonkterminal/gst-poetry latest e2bbeebcc73c 42 hours ago 2.02GB + ghcr.io/openbb-finance/openbbterminal-poetry latest b1409a304750 42 hours ago 2.29GB ``` 3. Run a container You are now ready to run the terminal (every time you want to use the terminal you need to run this command): - `docker run -it --rm ghcr.io/gamestonkterminal/gst-poetry:latest` + `docker run -it --rm ghcr.io/openbb-finance/openbbterminal-poetry:latest` This will open up the terminal in your command prompt or terminal. Note that this has provided now environment file, so you will not be able to view plots or use keys at this stage. @@ -303,7 +303,7 @@ For API keys, create the `setenv` file if it doesn't already exist. It will automatically get created on the first launch, and won't get committed to Git because it is on the `.gitignore`. Set the API keys [as explained here](https://github.com/OpenBB-finance/OpenBBTerminal/blob/main/DOCKER_ADVANCED.md#environment-variables). Once you've put the API keys in that file, re-run the launch script, and it will use your API keys. -There are a few things that still don't work, and you can see what works and what doesn't [here](https://github.com/CoconutMacaroon/GamestonkTerminal/blob/main/openbb_terminal_web/README.md#todo). +There are a few things that still don't work, and you can see what works and what doesn't [here](https://github.com/CoconutMacaroon/OpenBBTerminal/blob/main/openbb_terminal_web/README.md#todo). ### API Keys