fix docker ci

.github/workflows/storybook.yml

@@ -36,16 +36,16 @@ jobs:
             *.cache-to=type=gha,scope=${{github.ref}},mode=max
       -
         name: Start services
-        run: docker compose up --wait --no-build
+        run: docker compose -f compose.yaml -f compose.ci.yaml up --wait --no-build
       -
         name: Check HTTP reachability
         run: curl -v --fail-with-body http://localhost
-      -
-        name: Check API reachability
-        run: curl -vk --fail-with-body https://localhost
       -
         name: Check PWA reachability
         run: "curl -vk --fail-with-body -H 'Accept: text/html' https://localhost"
+      -
+        name: Check API reachability
+        run: "curl -vk --fail-with-body -H 'Accept: application/ld+json' https://localhost"
       -
         name: Create test database
         run: docker compose exec -T php bin/console -e test doctrine:database:create

Dockerfile

@@ -15,14 +15,25 @@ RUN apk add --no-cache libc6-compat
 WORKDIR /srv/app
 
 RUN corepack enable && \
-	corepack prepare --activate pnpm@latest && \
-	pnpm config -g set store-dir /.pnpm-store
-
-# Development image
-FROM base as dev
+	corepack prepare --activate yarn@*
 
 EXPOSE 3000
 ENV PORT 3000
 ENV HOSTNAME localhost
 
-CMD ["sh", "-c", "pnpm install; pnpm storybook"]
+# Development image
+FROM base as dev
+
+CMD ["sh", "-c", "yarn install; yarn storybook"]
+
+FROM base as ci
+
+COPY --link package.json yarn.lock ./
+RUN set -eux; \
+	yarn
+
+# copy sources
+COPY --link . ./
+RUN yarn storybook:build
+
+CMD ["yarn", "serve"]

compose.ci.yaml

@@ -0,0 +1,5 @@
+services:
+  pwa:
+    build:
+      context: .
+      target: ci

package.json

@@ -67,6 +67,7 @@
     "react-dom": "^18.0.0",
     "react-test-renderer": "^18.0.0",
     "rimraf": "^5.0.0",
+    "serve": "^14.2.1",
     "storybook": "^7.5.3",
     "ts-jest": "^29.0.0",
     "ts-node": "^10.4.0",
@@ -85,6 +86,7 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch src",
     "watch": "tsc --watch",
     "storybook": "storybook dev -p 3000",
-    "build-storybook": "storybook build"
+    "storybook:build": "storybook build",
+    "storybook:serve": "serve storybook-static"
   }
 }