Skip to content

Commit

Permalink
Revert "457 deployment bug in staging (#460)" (#462)
Browse files Browse the repository at this point in the history
This reverts commit 2f49e77.
  • Loading branch information
MattPereira authored Oct 21, 2023
1 parent 2f49e77 commit 4ca28db
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
8 changes: 2 additions & 6 deletions dev/django.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@ 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
# shellcheck disable=SC2034
RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.3.0 python3 -
RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry python3 -
ENV PATH=/opt/poetry/bin:$PATH

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

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

# hadolint ignore=DL3018
RUN apk update && apk add --no-cache curl gcc musl-dev libffi-dev jq

# 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 -
# 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 -

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

0 comments on commit 4ca28db

Please sign in to comment.