Revert "Bug causing deployment to fail with Poetry version > 1.3.0 (#458

)" (#461) This reverts commit 27d8621. Co-authored-by: Alex Law <[email protected]>
hackforla · Oct 21, 2023 · 02aa4f7 · 02aa4f7
1 parent 27d8621
commit 02aa4f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/dev/django.dockerfile b/dev/django.dockerfile
@@ -9,8 +9,7 @@ WORKDIR /code
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Download Poetry into Path
-# shellcheck disable=SC2034
-RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry 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

diff --git a/stage/Dockerfile b/stage/Dockerfile
@@ -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_HOME=/opt/poetry 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 .