From 07bdfbf2404cad236eb1fbd1edee86342b62810e Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Sun, 13 Nov 2022 09:51:29 +0100
Subject: [PATCH] Build docker image with built project

---
 .github/workflows/docker.yml | 13 ++++++++++++-
 .github/workflows/pytest.yml |  2 +-
 Dockerfile                   |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5ef1f7e..e802687 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,7 +6,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v3    
+    - uses: actions/setup-python@v4
+      with:
+        python-version: "3.10.8"
+    - name: Install poetry
+      uses: abatilo/actions-poetry@v2
+      with:
+        poetry-version: 1.2.2
+    - name: Install dependencies
+      run: poetry install    
+    - name: Build project 
+      run: poetry build    
     - name: Build the Docker image
       run: |
         echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin docker.io
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 0293bc6..266d45c 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Run image
+    - name: Install poetry
       uses: abatilo/actions-poetry@v2
       with:
         poetry-version: ${{ matrix.poetry-version }}
diff --git a/Dockerfile b/Dockerfile
index edddb8c..656358a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,8 @@ COPY docker/docker-init.sh /usr/local/bin/
 RUN chmod +x usr/local/bin/docker-init.sh
 
 RUN cd /
-#COPY ${STACOSYS_FILENAME} /
-RUN wget https://github.com/kianby/stacosys/releases/download/${STACOSYS_VERSION}/${STACOSYS_FILENAME}
+COPY dist/${STACOSYS_FILENAME} /
+#RUN wget https://github.com/kianby/stacosys/releases/download/${STACOSYS_VERSION}/${STACOSYS_FILENAME}
 RUN python3 -m pip install ${STACOSYS_FILENAME} --target /stacosys
 RUN rm -f ${STACOSYS_FILENAME}