Merge pull request #77 from openimis-wb/fix/ci

Fix docker build & CI

Author: delcroip

.github/workflows/ci.yaml

@@ -38,10 +38,12 @@ jobs:
       - name: Setup environment
         run: |
           cp .env.example .env
+          sed -i.bak '/^DEMO_DATASET=/d;/^BE_TAG=/d;/^FE_TAG=/d;/^SECRET_KEY=/d' .env
+          rm -f .env.bak
+          echo 'SECRET_KEY=cypressci' >> .env
           echo 'DEMO_DATASET=true' >> .env
           echo 'BE_TAG=develop' >> .env
           echo 'FE_TAG=develop' >> .env
-          echo 'SECRET_KEY=cypressci' >> .env
           cp .env.cache.example .env.cache
           cp .env.openSearch.example .env.openSearch
           cp .env.database.example .env.database
@@ -68,10 +70,19 @@ jobs:
       - name: Cypress run
         uses: cypress-io/github-action@v6
         with:
-          record: true
-          parallel: true
+          record: false
+          parallel: false
           wait-on: 'http://localhost/front/'
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Upload test artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: cypress-artifacts
+          path: |
+            cypress/screenshots/**
+            cypress/videos/**
+            cypress/reports/**

README.md

@@ -104,5 +104,5 @@ This can be useful for local development or verifying a staging deployment,
 for example, if the target host is localhost:3000,
 pass it into the corresponding test command with `-- --config "baseUrl=http://localhost:3000"`:
 
-Headless: `npx cypress run -- --config "baseUrl=http://localhost:3000"`
-Headed: `npx cypress open -- --config "baseUrl=http://localhost:3000"`
+- Headless: `npx cypress run --config "baseUrl=http://localhost:3000"`
+- Headed: `npx cypress open --config "baseUrl=http://localhost:3000"`

compose.base.yml

@@ -21,7 +21,6 @@ x-api: &default-api
     - OPENSEARCH_HOSTS=${OPENSEARCH_HOSTS}
   volumes:
     - photos:/openimis-be/openIMIS/images/insurees
-   # - ./be.openimis.json:/openimis-be/openimis.json
   depends_on:
     db:
       condition: service_healthy
@@ -38,27 +37,16 @@ services:
       - OPENIMIS_CONF_JSON=${OPENIMIS_FE_CONF_JSON}
       - OPENSEARCH_BASIC_TOKEN=${OPENSEARCH_BASIC_TOKEN}
     networks:
-      proxy:
       openimis-net:
+    ports:
+      - ${HTTP_PORT:-80}:80
+      - ${HTTPS_PORT:-443}:443
     depends_on:
       - backend
     volumes:
       - ./data/certbot/conf:/etc/letsencrypt
       - ./data/certbot/www:/var/www/certbot
-      # - ./fe.openimis.json:/app/openimis.json
       # comment the following line if you are using your own gateway
-      # - ./conf/nginx:/conf/
-    ports:
-      - ${HTTP_PORT:-80}:80
-      - ${HTTPS_PORT:-443}:443
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.${PROJECT_NAME}.rule=Host("${DOMAIN}")
-      - traefik.http.routers.${PROJECT_NAME}.entrypoints=websecure
-      - traefik.http.routers.${PROJECT_NAME}.tls=true
-      - traefik.docker.network=proxy
-      - traefik.http.services.${PROJECT_NAME}.loadbalancer.server.port=80
-
       - ./conf/nginx:/conf/
   migrations:
     <<: *default-api
@@ -71,13 +59,17 @@ services:
     depends_on:
       migrations:
         condition: service_completed_successfully   
+      redis:
+        condition: service_healthy
   worker:
     <<: *default-api
     command: worker
     restart: always
     depends_on:
       migrations:
         condition: service_completed_successfully
+      redis:
+        condition: service_healthy
     deploy:
       mode: replicated
       replicas: ${WORKER_REPLICAS:-3}
@@ -89,8 +81,6 @@ services:
 networks:
   openimis-net:
     name: "${PROJECT_NAME:-openimis}-net"
-  proxy:
-    external: true
 volumes:
   database:
   photos:

compose.cache.yml

@@ -4,10 +4,10 @@ services:
     restart: always
     ports:
       - "6379:6379"
-    command: redis-server /usr/local/etc/redis/redis.conf --requirepass ${REDIS_PASSWORD} --maxmemory ${REDIS_MAX_MEMORY:-256mb}
+    command: redis-server /usr/local/etc/redis/redis.conf --requirepass ${REDIS_PASSWORD}
     volumes:
       - redis-database:/data
-      #- ./conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
+      - ./conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
     env_file:
       - ".env.cache"
     environment:
@@ -16,5 +16,10 @@ services:
       - REDIS_DATABASES=1
     networks:
       openimis-net:
+    healthcheck:
+      test: ["CMD", "redis-cli", "-a", "$$REDIS_PASSWORD", "ping"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
 volumes:
-  redis-database:
+  redis-database: