Merge branch 'main' into dev

Author: joshunrau

apps/api/Dockerfile

@@ -9,7 +9,7 @@ RUN corepack enable
 RUN pnpm install -g turbo@latest
 
 # PRUNE WORKSPACE
-# Note: Here we cannot use --docker, as is recomended, since the generated
+# Note: Here we cannot use --docker, as is recommended, since the generated
 # json directory does not allow linking package.json executable files
 FROM base AS pruner
 COPY . .

apps/gateway/Dockerfile

@@ -9,7 +9,7 @@ RUN corepack enable
 RUN pnpm install -g turbo@latest
 
 # PRUNE WORKSPACE
-# Note: Here we cannot use --docker, as is recomended, since the generated
+# Note: Here we cannot use --docker, as is recommended, since the generated
 # json directory does not allow linking package.json executable files
 FROM base AS pruner
 COPY . .

apps/playground/Dockerfile

@@ -0,0 +1,27 @@
+FROM node:iron AS base
+WORKDIR /app
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+ENV NODE_OPTIONS="--max-old-space-size=8192"
+RUN corepack enable
+RUN pnpm install -g turbo@latest
+
+# PRUNE WORKSPACE
+# Note: Here we cannot use --docker, as is recommended, since the generated
+# json directory does not allow linking package.json executable files
+FROM base AS pruner
+COPY . .
+RUN turbo prune @opendatacapture/playground
+
+# INSTALL DEPENDENCIES AND BUILD
+FROM base AS builder
+COPY tsconfig.base.json vitest.config.ts vitest.workspace.ts ./
+COPY --from=pruner /app/out/ .
+RUN pnpm install --frozen-lockfile 
+RUN turbo build --filter=@opendatacapture/playground
+
+# SERVE PLAYGROUND
+FROM base AS runner
+RUN pnpm install -g [email protected]
+COPY --from=builder /app/apps/playground/dist ./
+CMD [ "http-server", "-s", "-p", "80", "-P", "http://localhost:80?", "--gzip", "." ]

apps/playground/package.json

@@ -5,12 +5,12 @@
   "private": true,
   "license": "Apache-2.0",
   "scripts": {
-    "build": "tsc && env-cmd -f ../../.env pnpm exec vite build",
+    "build": "tsc && pnpm exec vite build",
     "deploy": "rsync -r dist/* [email protected]:/home/unrjos/www/playground.opendatacapture.org",
-    "dev": "NODE_ENV=development env-cmd -f ../../.env pnpm exec vite",
+    "dev": "NODE_ENV=development pnpm exec vite",
     "format": "prettier --write src",
     "lint": "tsc && eslint --fix src",
-    "storybook": "env-cmd -f ../../.env storybook dev -p 6006"
+    "storybook": "storybook dev -p 6006"
   },
   "dependencies": {
     "@douglasneuroinformatics/libcrypto": "catalog:",

apps/web/Dockerfile

@@ -8,7 +8,7 @@ RUN corepack enable
 RUN pnpm install -g turbo@latest
 
 # PRUNE WORKSPACE
-# Note: Here we cannot use --docker, as is recomended, since the generated
+# Note: Here we cannot use --docker, as is recommended, since the generated
 # json directory does not allow linking package.json executable files
 FROM base AS builder
 COPY . .

docker-compose.yaml

@@ -15,6 +15,7 @@ services:
     profiles:
       - '' #load by default without having to specify docker compose --profile
       - gateway
+      - fullstack
   api:
     image: ghcr.io/douglasneuroinformatics/open-data-capture-api:${RELEASE_CHANNEL}
     build:
@@ -46,6 +47,7 @@ services:
       - 80
     profiles:
       - '' #load by default without having to specify docker compose --profile
+      - fullstack
   gateway:
     image: ghcr.io/douglasneuroinformatics/open-data-capture-gateway:${RELEASE_CHANNEL}
     build:
@@ -60,6 +62,7 @@ services:
     profiles:
       - '' #load by default without having to specify docker compose --profile
       - gateway
+      - fullstack
     restart: unless-stopped
     environment:
       - NODE_ENV=production
@@ -86,6 +89,7 @@ services:
       - 80
     profiles:
       - '' #load by default without having to specify docker compose --profile
+      - fullstack
     restart: unless-stopped
   mongo:
     image: mongo:${MONGODB_VERSION}
@@ -105,3 +109,16 @@ services:
       - ./mongo/data:/data/db
     profiles:
       - '' #load by default without having to specify docker compose --profile
+      - fullstack
+  playground:
+    build:
+      context: .
+      dockerfile: ./apps/playground/Dockerfile
+    environment:
+      - NODE_ENV=production
+    ports:
+      - '3750:80'
+    restart: unless-stopped
+    profiles:
+      - fullstack
+      - playground