Merge pull request #524 from boozallen/523-fix-poetry-versioning-brea…

…kage #523 - Poetry version fixes
boozallen · Jan 6, 2025 · 4f1faaf · 4f1faaf
2 parents 4a95e9b + 226386b
commit 4f1faaf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/actions/install_dependencies/action.yaml b/.github/actions/install_dependencies/action.yaml
@@ -22,6 +22,8 @@ runs:
         default: 3.11.4
     - name: Install Poetry
       uses: snok/install-poetry@v1
+      with:
+        version: 1.8.5
     - name: Install Helm
       shell: bash
       run: |

diff --git a/...training-api-containers/aissemble-model-training-api/src/main/resources/docker/Dockerfile b/...training-api-containers/aissemble-model-training-api/src/main/resources/docker/Dockerfile
@@ -4,7 +4,7 @@ FROM docker.io/python:3.11 AS habushu_builder
 RUN python -m ensurepip --upgrade && \
     pip install poetry && \
     poetry self add poetry-monorepo-dependency-plugin && \
-    poetry self add poetry-plugin-bundle@1.3.0
+    poetry self add poetry-plugin-bundle
 
 WORKDIR /work-dir
 COPY --chown=1001 target/containerize-support ./containerize-support/

diff --git a/extensions/extensions-docker/aissemble-versioning/src/main/resources/docker/Dockerfile b/extensions/extensions-docker/aissemble-versioning/src/main/resources/docker/Dockerfile
@@ -4,7 +4,7 @@ FROM docker.io/python:3.11 AS habushu_builder
 RUN python -m ensurepip --upgrade && \
     pip install poetry && \
     poetry self add poetry-monorepo-dependency-plugin && \
-    poetry self add poetry-plugin-bundle@1.3.0
+    poetry self add poetry-plugin-bundle
 
 WORKDIR /work-dir
 COPY --chown=1001 target/containerize-support ./containerize-support/

diff --git a/extensions/extensions-docker/pom.xml b/extensions/extensions-docker/pom.xml
@@ -80,6 +80,8 @@
                                 <dockerBuilderBase>docker.io/python:3.11</dockerBuilderBase>
                                 <dockerFinalBase>docker.io/python:3.11-slim</dockerFinalBase>
                                 <dockerUser>1001</dockerUser>
+                                <!-- Turning off the Dockerfile update so that we can remove the fixed version for poetry-plugin-bundle in the Dockerfiles. The latest version of poetry breaks the build. We will revert this change after we update Habushu to work with poetry version 2.x. -->
+                                <updateDockerfile>false</updateDockerfile>
                             </configuration>
                         </execution>
                     </executions>