Merge pull request #30 from gbourniq/fix/update_docker_deploy_commands

fix: update docker deploy commands

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
       run: |
         curl -sSL https://install.python-poetry.org | python3 -
         poetry config virtualenvs.create false
-        poetry install
+        poetry install --sync --no-interaction
 
     - name: Run lint
       run: make lint
@@ -93,7 +93,7 @@ jobs:
       run: |
         curl -sSL https://install.python-poetry.org | python3 -
         poetry config virtualenvs.create false
-        poetry install
+        poetry install --sync --no-interaction
 
     - name: Run tests
       run: make test
@@ -106,7 +106,7 @@ jobs:
         fail_ci_if_error: false
 
   build:
-    name: Build Docker Images
+    name: Build Test
     needs: commit-check
     runs-on: ubuntu-latest
     steps:
@@ -130,7 +130,7 @@ jobs:
       run: |
         curl -sSL https://install.python-poetry.org | python3 -
         poetry config virtualenvs.create false
-        poetry install
+        poetry install --sync --no-interaction
 
     - name: Set up Docker
       uses: docker/setup-buildx-action@v3
@@ -139,7 +139,7 @@ jobs:
       run: make build
 
   integration-tests:
-    name: Integration Tests (${{ matrix.component }})
+    name: ${{ matrix.component }}
     needs: [lint, test, build]
     runs-on: ubuntu-latest
     strategy:
@@ -187,7 +187,7 @@ jobs:
       run: |
         pip install python-semantic-release==7.34.6
         git pull --rebase
-        python -m semantic_release publish --patch
+        python -m semantic_release publish
 
   publish:
     name: Publish Docker Images

README.md

@@ -53,7 +53,7 @@ docker-compose up -d --build
 
 Run the app in production
 ```bash
-GIT_TAG=v0.1.28 ./deploy.sh
+GIT_TAG=v0.1.28 ./run.sh
 ```
 
 ### Local Development
@@ -62,7 +62,7 @@ GIT_TAG=v0.1.28 ./deploy.sh
 
 ```bash
 python3.12 -m pip install poetry -U
-poetry install
+poetry install --sync --no-interaction
 ```
 
 2. Start services:

api.Dockerfile

@@ -5,7 +5,9 @@ LABEL description="Portfolio Analytics API"
 
 # Install dependencies
 COPY pyproject.toml ./pyproject.toml
-RUN poetry install --only main,api
+RUN pip install --no-cache-dir poetry==1.8.5 && \
+    poetry config virtualenvs.create false && \
+    poetry install --no-interaction --no-ansi --only main,api
 
 # Copy source code to the container
 COPY portfolio_analytics/common portfolio_analytics/common

base.Dockerfile

@@ -23,7 +23,3 @@ RUN groupadd -g 1000 appgroup && \
     useradd -u 1000 -g appgroup -s /bin/bash -m appuser
 
 WORKDIR /app
-
-# Install poetry
-RUN python3.12 -m pip install poetry==1.8.5 && \
-    poetry config virtualenvs.create false

dashboard.Dockerfile

@@ -5,7 +5,9 @@ LABEL description="Portfolio Analytics Dashboard"
 
 # Install dependencies
 COPY pyproject.toml ./pyproject.toml
-RUN poetry install --only main,dashboard
+RUN pip install --no-cache-dir poetry==1.8.5 && \
+    poetry config virtualenvs.create false && \
+    poetry install --no-interaction --no-ansi --only main,dashboard
 
 # Copy source code to the container
 COPY portfolio_analytics/common portfolio_analytics/common

docker-compose.yml

@@ -1,11 +1,6 @@
 volumes:
   shared-data:
     driver: local
-    # driver_opts:
-    #   type: none
-    #   o: bind
-    #   device: ${PWD}/data
-    # name: portfolio-analytics-data
 
 services:
   data:

pyproject.toml

@@ -10,7 +10,7 @@ packages = [{ include = "portfolio_analytics" }]
 
 [tool.poetry.dependencies]
 python = ">=3.12,<3.13"
-numpy = "^2.1.3"
+numpy = "2.2.0"
 openpyxl = "^3.1.5"
 pandas = "^2.2.3"
 pyarrow = "^18.1.0"

deploy.sh → run.sh

@@ -9,21 +9,23 @@ echo "Deploying application version ${GIT_TAG:-latest}"
 docker run -d \
   --name data \
   --user 1000:1000 \
-  -v shared-data:/data \
+  -v shared-data:/data:rw \
   ghcr.io/gbourniq/portfolio_analytics/data:${GIT_TAG:-latest}
 
 # Dashboard service
 docker run -d \
-  --name api \
+  --name dashboard \
   --user 1000:1000 \
-  -v shared-data:/app/data \
-  -p 8000:8000 \
-  ghcr.io/gbourniq/portfolio_analytics/api:${GIT_TAG:-latest}
+  --group-add 1000 \
+  -p 8050:8050 \
+  -v shared-data:/app/data:rw \
+  ghcr.io/gbourniq/portfolio_analytics/dashboard:${GIT_TAG:-latest}
 
 # API service
 docker run -d \
-  --name dashboard \
+  --name api \
   --user 1000:1000 \
-  -v shared-data:/app/data \
-  -p 8050:8050 \
-  ghcr.io/gbourniq/portfolio_analytics/dashboard:${GIT_TAG:-latest}
+  --group-add 1000 \
+  -p 8000:8000 \
+  -v shared-data:/app/data:rw \
+  ghcr.io/gbourniq/portfolio_analytics/api:${GIT_TAG:-latest}