diff options
| author | Artem Veremey <aia@users.noreply.github.com> | 2021-09-06 17:27:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-06 17:27:23 -0700 |
| commit | 1491ddce301ee62493fbf6282b00fc4724286ca5 (patch) | |
| tree | 9123f442700278ddd32a66808d42dc889407e86e | |
| parent | d1a473d2664d5802aff82578d52fc46e7ca2b7d9 (diff) | |
Updating docker build configuration for poetry-full-deps to depend on poetry-deps (#735)
| -rw-r--r-- | docker/compose.env | 12 | ||||
| -rw-r--r-- | docker/docker-compose.yaml | 3 | ||||
| -rw-r--r-- | docker/gst-poetry-full-deps.dockerfile | 11 |
3 files changed, 11 insertions, 15 deletions
diff --git a/docker/compose.env b/docker/compose.env index 85aac35b0a2..596186a72ef 100644 --- a/docker/compose.env +++ b/docker/compose.env @@ -1,11 +1,11 @@ GST_DOCKER_IMAGE_PREFIX="ghcr.io/gamestonkterminal" GST_DOCKER_PYTHON_VERSION="1.1.0" -GST_DOCKER_DEPS_VERSION="1.2.0" -GST_DOCKER_POETRY_DEPS_VERSION="1.2.0" -GST_DOCKER_POETRY_FULL_DEPS_VERSION="1.2.0" -GST_DOCKER_GST_VERSION="1.2.0" -GST_DOCKER_POETRY_VERSION="1.2.0" -GST_DOCKER_POETRY_FULL_VERSION="1.2.0" +GST_DOCKER_DEPS_VERSION="1.4.0" +GST_DOCKER_POETRY_DEPS_VERSION="1.4.0" +GST_DOCKER_POETRY_FULL_DEPS_VERSION="1.4.0" +GST_DOCKER_GST_VERSION="1.4.0" +GST_DOCKER_POETRY_VERSION="1.4.0" +GST_DOCKER_POETRY_FULL_VERSION="1.4.0" export GST_DOCKER_IMAGE_PREFIX export GST_DOCKER_PYTHON_VERSION diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 50019dfa455..06f1868732f 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -28,6 +28,7 @@ services: 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: build: @@ -65,7 +66,7 @@ services: dockerfile: docker/gst-poetry-full.dockerfile args: GST_DOCKER_IMAGE_PREFIX: ${GST_DOCKER_IMAGE_PREFIX} - GST_DOCKER_POETRY_DEPS_VERSION: ${GST_DOCKER_POETRY_FULL_DEPS_VERSION} + 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}" tty: true env_file: setenv diff --git a/docker/gst-poetry-full-deps.dockerfile b/docker/gst-poetry-full-deps.dockerfile index 011bb980954..fe841a4bdd7 100644 --- a/docker/gst-poetry-full-deps.dockerfile +++ b/docker/gst-poetry-full-deps.dockerfile @@ -1,11 +1,6 @@ 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} +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 pyproject.toml poetry.lock /home/python/ - -RUN mkdir /home/python/gamestonk_terminal && \ - touch gamestonk_terminal/__init__.py && \ - chown python:python /home/python/gamestonk_terminal /home/python/gamestonk_terminal/__init__.py && \ - poetry install && \ +RUN cd /home/python/gamestonk_terminal && \ poetry install -E prediction |