From 8fb648e26eaddc97726e370b2bb77e384f5a95fe Mon Sep 17 00:00:00 2001
From: Matthew Rafuse <Matthew.Rafuse@cyber.gc.ca>
Date: Mon, 22 Apr 2024 13:09:12 -0400
Subject: [PATCH] Fixes to build process

---
 docker/Dockerfile         | 2 +-
 docker/build_container.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e614570..bf6c8b5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -62,7 +62,7 @@ USER howler
 RUN touch /tmp/before-pip
 
 # Install howler UI into local so it merges new and old packages
-COPY setup.py dist* dist/
+COPY dist* dist/
 
 RUN pip install --no-cache-dir --no-warn-script-location --user dist/howler_api-*-py3-none-any.whl && \
     rm -rf ~/.cache/pip && \
diff --git a/docker/build_container.sh b/docker/build_container.sh
index 043a77b..ea5c0a7 100755
--- a/docker/build_container.sh
+++ b/docker/build_container.sh
@@ -1,13 +1,13 @@
 #!/bin/bash -ex
 
 # Get version
-version=$( (cd .. && python setup.py --version))
+version=$( (cd .. && poetry version --short))
 
 # Clean build dir
-(cd .. && python setup.py clean --all && rm -rf dist)
+(cd .. && rm -rf dist)
 
 # Build wheel
-(cd .. && python setup.py bdist_wheel)
+(cd .. && poetry build)
 
 # Build container
 (cd .. && docker build --build-arg version=$version --no-cache -f docker/Dockerfile -t cccs/howler-api:latest -t cccs/howler-api:$version .)