Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

457 deployment bug in staging #460

Merged
merged 6 commits into from
Oct 21, 2023
Merged

457 deployment bug in staging #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f57afff
Patch bug causing deployment to fail with Poetry version > 1.3.0
alexlaw528 Oct 19, 2023
7e35b50
Patch linting issues caused by alpine
alexlaw528 Oct 19, 2023
855d47b
Fixed rewriting of download location of poetry
alexlaw528 Oct 20, 2023
34722a9
Merge branch 'main' into 457_deployment_bug_in_staging
alexlaw528 Oct 20, 2023
18b552a
Bring dev image to same pattern format as staging
alexlaw528 Oct 21, 2023
85fe0af
Merge branch 'main' into 457_deployment_bug_in_staging
alexlaw528 Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions dev/django.dockerfile
View file
Open in desktop
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
Comment on lines +8 to 15
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like this comment is accidentally being repeated twice

#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
View file
Open in desktop
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