Skip to content

Commit

Permalink
457 deployment bug in staging (#460)
Browse files Browse the repository at this point in the history
* Patch bug causing deployment to fail with Poetry version > 1.3.0

* Patch linting issues caused by alpine

* Fixed rewriting of download location of poetry

* Bring dev image to same pattern format as staging
  • Loading branch information
alexlaw528 authored Oct 21, 2023
1 parent 02aa4f7 commit 2f49e77
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
8 changes: 6 additions & 2 deletions dev/django.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED=1
WORKDIR /code

#Download Poetry into Path
ENV POETRY_HOME=/usr/local/poetry
ENV PATH="$POETRY_HOME/bin:${PATH}"

# Set up shell for pipe
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# Download Poetry into Path
RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry python3 -
ENV PATH=/opt/poetry/bin:$PATH
# shellcheck disable=SC2034
RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.3.0 python3 -

# Download dependencies
COPY pyproject.toml ./
Expand Down
9 changes: 5 additions & 4 deletions stage/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ ENV POETRY_HOME=/usr/local/poetry
ENV PATH="$POETRY_HOME/bin:${PATH}"

# Set up shell for pipe
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]

# hadolint ignore=DL3018
RUN apk update && apk add --no-cache curl gcc musl-dev libffi-dev jq
# I could not make the linter accept 4006, so I will put this here. Whoever is interested should find a way to resolve this without ignoring.
# hadolint ignore=DL4006
RUN curl -sSL https://install.python-poetry.org | python3 -

# Disabling shellcheck SC2034 because it considers the unused variables POETRY_HOME and POETRY_VERSION as a bug
# shellcheck disable=SC2034
RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.3.0 python3 -

COPY backend/pyproject.toml .
COPY backend/poetry.lock .
Expand Down

0 comments on commit 2f49e77

Please sign in to comment.