diff --git a/bcol-api/Dockerfile b/bcol-api/Dockerfile index 5f9cd078a..d48b75ab0 100644 --- a/bcol-api/Dockerfile +++ b/bcol-api/Dockerfile @@ -77,6 +77,7 @@ COPY --chown=web:web ./README.md /code # Project initialization: RUN --mount=type=cache,target="$POETRY_CACHE_DIR" \ echo "$APP_ENV" \ + && poetry config installer.max-workers 1 \ && poetry version \ # Install deps: && poetry run pip install -U pip \ @@ -84,9 +85,6 @@ RUN --mount=type=cache,target="$POETRY_CACHE_DIR" \ $(if [ -z ${APP_ENV+x} ] | [ "$APP_ENV" = 'production' ]; then echo '--only main'; fi) \ --no-interaction --no-ansi -# Concurrent fix until poetry 1.8.3+ is released -RUN curl https://gist.githubusercontent.com/seeker25/0dd67670f738f1dc2bc24a885ab78914/raw/a858698a81d7b76efe6e1ec3ef9850ae3667f923/executor.py -o /usr/local/venv/lib/python3.12/site-packages/poetry/installation/executor.py - # Running as non-root user: USER web diff --git a/bcol-api/Makefile b/bcol-api/Makefile index 0d21fddd1..4129c5077 100755 --- a/bcol-api/Makefile +++ b/bcol-api/Makefile @@ -39,7 +39,7 @@ clean-test: ## clean test files install: clean unset HOME ## unset HOME because it's in the DEV .env file, will cause permissions issues pip install poetry ;\ - python -c "import site; import urllib.request; url = 'https://gist.githubusercontent.com/seeker25/0dd67670f738f1dc2bc24a885ab78914/raw/a858698a81d7b76efe6e1ec3ef9850ae3667f923/executor.py'; file_name = site.getsitepackages()[0] + '/poetry/installation/executor.py'; print('Poetry 1.8.3 fix - Copying ' + url + ' to ' + file_name); urllib.request.urlretrieve(url, file_name)" + poetry config installer.max-workers 1 poetry install ################################################################################# diff --git a/jobs/ftp-poller/Dockerfile b/jobs/ftp-poller/Dockerfile index 2d881b0f4..578b8af76 100644 --- a/jobs/ftp-poller/Dockerfile +++ b/jobs/ftp-poller/Dockerfile @@ -85,14 +85,12 @@ COPY --chown=web:web ./poetry.lock ./pyproject.toml . RUN --mount=type=cache,target="$POETRY_CACHE_DIR" \ echo "$APP_ENV" \ && poetry version \ + && poetry config installer.max-workers 1 \ && poetry run pip install -U pip \ && poetry install \ $(if [ -z ${APP_ENV+x} ] | [ "$APP_ENV" = 'production' ]; then echo '--only main'; fi) \ --no-interaction --no-ansi -# Concurrent fix until poetry 1.8.3+ is released -RUN curl https://gist.githubusercontent.com/seeker25/0dd67670f738f1dc2bc24a885ab78914/raw/a858698a81d7b76efe6e1ec3ef9850ae3667f923/executor.py -o /usr/local/venv/lib/python3.12/site-packages/poetry/installation/executor.py - COPY . . diff --git a/jobs/ftp-poller/Makefile b/jobs/ftp-poller/Makefile index 14da5548f..e6c179c09 100644 --- a/jobs/ftp-poller/Makefile +++ b/jobs/ftp-poller/Makefile @@ -39,7 +39,7 @@ clean-test: ## clean test files install: clean unset HOME ## unset HOME because it's in the DEV .env file, will cause permissions issues pip install poetry ;\ - python -c "import site; import urllib.request; url = 'https://gist.githubusercontent.com/seeker25/0dd67670f738f1dc2bc24a885ab78914/raw/a858698a81d7b76efe6e1ec3ef9850ae3667f923/executor.py'; file_name = site.getsitepackages()[0] + '/poetry/installation/executor.py'; print('Poetry 1.8.3 fix - Copying ' + url + ' to ' + file_name); urllib.request.urlretrieve(url, file_name)" + poetry config installer.max-workers 1 poetry install ################################################################################# diff --git a/jobs/payment-jobs/Dockerfile b/jobs/payment-jobs/Dockerfile index 728a1de3e..a86bf3edf 100644 --- a/jobs/payment-jobs/Dockerfile +++ b/jobs/payment-jobs/Dockerfile @@ -98,14 +98,12 @@ COPY --chown=web:web ./poetry.lock ./pyproject.toml . RUN --mount=type=cache,target="$POETRY_CACHE_DIR" \ echo "$APP_ENV" \ && poetry version \ + && poetry config installer.max-workers 1 \ && poetry run pip install -U pip \ && poetry install \ $(if [ -z ${APP_ENV+x} ] | [ "$APP_ENV" = 'production' ]; then echo '--only main'; fi) \ --no-interaction --no-ansi -# Concurrent fix until poetry 1.8.3+ is released -RUN curl https://gist.githubusercontent.com/seeker25/0dd67670f738f1dc2bc24a885ab78914/raw/a858698a81d7b76efe6e1ec3ef9850ae3667f923/executor.py -o /usr/local/venv/lib/python3.12/site-packages/poetry/installation/executor.py - COPY . . # Set ownership and permissions # Set scripts as executable (make files and python files do not have to be marked) diff --git a/jobs/payment-jobs/Makefile b/jobs/payment-jobs/Makefile index 1ddd16dba..2c10cf1c8 100644 --- a/jobs/payment-jobs/Makefile +++ b/jobs/payment-jobs/Makefile @@ -38,7 +38,7 @@ clean-test: ## clean test files install: clean pip install poetry ;\ - python -c "import site; import urllib.request; url = 'https://gist.githubusercontent.com/seeker25/0dd67670f738f1dc2bc24a885ab78914/raw/a858698a81d7b76efe6e1ec3ef9850ae3667f923/executor.py'; file_name = site.getsitepackages()[0] + '/poetry/installation/executor.py'; print('Poetry 1.8.3 fix - Copying ' + url + ' to ' + file_name); urllib.request.urlretrieve(url, file_name)" + poetry config installer.max-workers 1 poetry install ################################################################################# diff --git a/pay-admin/Dockerfile b/pay-admin/Dockerfile index 189131bb4..e0e950ee9 100644 --- a/pay-admin/Dockerfile +++ b/pay-admin/Dockerfile @@ -71,15 +71,13 @@ COPY --chown=web:web ./README.md /code RUN --mount=type=cache,target="$POETRY_CACHE_DIR" \ echo "$APP_ENV" \ && poetry version \ + && poetry config installer.max-workers 1 \ # Install deps: && poetry run pip install -U pip \ && poetry install \ $(if [ -z ${APP_ENV+x} ] | [ "$APP_ENV" = 'production' ]; then echo '--only main'; fi) \ --no-interaction --no-ansi -# Concurrent fix until poetry 1.8.3+ is released -RUN curl https://gist.githubusercontent.com/seeker25/0dd67670f738f1dc2bc24a885ab78914/raw/a858698a81d7b76efe6e1ec3ef9850ae3667f923/executor.py -o /usr/local/venv/lib/python3.12/site-packages/poetry/installation/executor.py - # Running as non-root user: USER web diff --git a/pay-admin/Makefile b/pay-admin/Makefile index 7548c7e4b..d2ae55707 100755 --- a/pay-admin/Makefile +++ b/pay-admin/Makefile @@ -39,6 +39,7 @@ clean-test: ## clean test files install: clean unset HOME ## unset HOME because it's in the DEV .env file, will cause permissions issues pip install poetry ;\ + poetry config installer.max-workers 1 poetry install ################################################################################# diff --git a/pay-api/Dockerfile b/pay-api/Dockerfile index 2a2ab05b7..5bb31156d 100644 --- a/pay-api/Dockerfile +++ b/pay-api/Dockerfile @@ -72,15 +72,13 @@ COPY --chown=web:web ./README.md /code RUN --mount=type=cache,target="$POETRY_CACHE_DIR" \ echo "$APP_ENV" \ && poetry version \ + && poetry config installer.max-workers 1 \ # Install deps: && poetry run pip install -U pip \ && poetry install \ $(if [ -z ${APP_ENV+x} ] | [ "$APP_ENV" = 'production' ]; then echo '--only main'; fi) \ --no-interaction --no-ansi - -# Concurrent fix until poetry 1.8.3+ is released -RUN curl https://gist.githubusercontent.com/seeker25/0dd67670f738f1dc2bc24a885ab78914/raw/a858698a81d7b76efe6e1ec3ef9850ae3667f923/executor.py -o /usr/local/venv/lib/python3.12/site-packages/poetry/installation/executor.py - + # Running as non-root user: USER web diff --git a/pay-api/Makefile b/pay-api/Makefile index 04758bacb..dbda2894c 100755 --- a/pay-api/Makefile +++ b/pay-api/Makefile @@ -38,7 +38,7 @@ clean-test: ## clean test files install: clean pip install poetry ;\ - python -c "import site; import urllib.request; url = 'https://gist.githubusercontent.com/seeker25/0dd67670f738f1dc2bc24a885ab78914/raw/a858698a81d7b76efe6e1ec3ef9850ae3667f923/executor.py'; file_name = site.getsitepackages()[0] + '/poetry/installation/executor.py'; print('Poetry 1.8.3 fix - Copying ' + url + ' to ' + file_name); urllib.request.urlretrieve(url, file_name)" + poetry config installer.max-workers 1 poetry install ################################################################################# diff --git a/pay-queue/Dockerfile b/pay-queue/Dockerfile index 38ba3ffc9..9647215c1 100644 --- a/pay-queue/Dockerfile +++ b/pay-queue/Dockerfile @@ -71,15 +71,13 @@ COPY --chown=web:web ./README.md /code RUN --mount=type=cache,target="$POETRY_CACHE_DIR" \ echo "$APP_ENV" \ && poetry version \ + && poetry config installer.max-workers 1 \ # Install deps: && poetry run pip install -U pip \ && poetry install \ $(if [ -z ${APP_ENV+x} ] | [ "$APP_ENV" = 'production' ]; then echo '--only main'; fi) \ --no-interaction --no-ansi -# Concurrent fix until poetry 1.8.3+ is released -RUN curl https://gist.githubusercontent.com/seeker25/0dd67670f738f1dc2bc24a885ab78914/raw/a858698a81d7b76efe6e1ec3ef9850ae3667f923/executor.py -o /usr/local/venv/lib/python3.12/site-packages/poetry/installation/executor.py - # Running as non-root user: USER web