reworked astro collections

docker-compose.yml

@@ -10,7 +10,7 @@ services:
     ports:
       - "1337:1337"
     env_file:
-      - docker-compose.env
+      - .env
     environment:
       DATABASE_CLIENT: ${DATABASE_CLIENT}
       DATABASE_HOST: ${DATABASE_HOST}
@@ -29,31 +29,14 @@ services:
       - ./server/public/uploads:/opt/app/public/uploads
       - ./server/.tmp:/opt/app/.tmp
     depends_on:
-      - postgres
-    networks:
-      - strapi-network
-
-  client:
-    build:
-      context: ./client
-      dockerfile: Dockerfile
-    container_name: astro-client
-    restart: unless-stopped
-    ports:
-      - "4321:4321"
-    env_file:
-      - docker-compose.env
-    environment:
-      NODE_ENV: ${CLIENT_NODE_ENV}
-      STRAPI_URL: ${STRAPI_URL}
-    volumes:
-      - ./client/src:/opt/app/src
-      - ./client/public:/opt/app/public
-      - ./client/astro.config.mjs:/opt/app/astro.config.mjs
-      - ./client/tsconfig.json:/opt/app/tsconfig.json
-    depends_on:
-      - strapi
-      - postgres
+      postgres:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD", "nc", "-z", "localhost", "1337"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
     networks:
       - strapi-network
 
@@ -69,8 +52,12 @@ services:
       POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
     volumes:
       - postgres_data:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DATABASE_USERNAME} -d ${DATABASE_NAME}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
     networks:
       - strapi-network