Merge branch 'main' into dependabot/pip/server/jinja2-3.1.5

.aws/task-definition.json

@@ -93,7 +93,7 @@
       "cpu": 0,
       "portMappings": [],
       "command": [
-        "/bin/sh -c \"celery -A celery_worker.celery worker --loglevel=info\""
+        "/bin/sh -c \"celery -A workers.celery_config.celery worker --loglevel=info\""
       ],
       "entryPoint": ["sh", "-c"],
       "essential": true,

.github/workflows/test-docker.yml

@@ -0,0 +1,42 @@
+name: Test Docker Containerization
+
+on: [push]
+
+env:
+  ECR_REPOSITORY_BACKEND: atlas-backend
+  ECR_REPOSITORY_FRONTEND: atlas-frontend
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  frontend-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Build docker image for frontend
+        id: build-front-image
+        env:
+          ECR_REGISTRY: atlas-ecr-registry
+          IMAGE_TAG: ${{ github.sha }}
+        run: |
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY_FRONTEND:$IMAGE_TAG -f Dockerfile.client .
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY_FRONTEND:$IMAGE_TAG" >> $GITHUB_OUTPUT
+
+  backend-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Build docker image for backend
+        id: build-backend-image
+        env:
+          ECR_REGISTRY: atlas-ecr-registry
+          IMAGE_TAG: ${{ github.sha }}
+        run: |
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY_BACKEND:$IMAGE_TAG -f Dockerfile.server .
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY_BACKEND:$IMAGE_TAG" >> $GITHUB_OUTPUT

.github/workflows/test-frontend.yml

@@ -5,13 +5,23 @@ on: [push]
 jobs:
   vite-test:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: client
     steps:
       - uses: actions/checkout@v4
-      - run: npm ci
-        working-directory: client
-      - run: npm run lint
-        working-directory: client
-      - run: npm run build
-        working-directory: client
-      - run: npm test
-        working-directory: client
+
+      - name: Install packages
+        run: npm ci
+
+      - name: Print file tree (excluding node_modules)
+        run: tree -I 'node_modules'
+
+      - name: Run lint
+        run: npm run lint
+
+      - name: Build front-end files
+        run: npm run build
+
+      - name: Run tests
+        run: npm test

.gitignore

@@ -14,7 +14,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/

Dockerfile.client

@@ -2,9 +2,10 @@
 FROM --platform=linux/amd64 public.ecr.aws/bitnami/node:20 AS build-step
 WORKDIR /app
 ENV PATH=/app/node_modules/.bin:$PATH
-COPY client/package*.json ./
-RUN npm ci
+
 COPY client/ ./
+
+RUN npm ci
 ENV NODE_ENV=production
 RUN npm run build
 

client/components.json

@@ -6,8 +6,8 @@
   "tailwind": {
     "config": "tailwind.config.ts",
     "css": "src/index.css",
-    "baseColor": "green",
-    "cssVariables": false,
+    "baseColor": "zinc",
+    "cssVariables": true,
     "prefix": ""
   },
   "aliases": {