Merge pull request #1085 from joshunrau/playground-docker

replace Caddy with http-server

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

@@ -1,32 +1,27 @@
-#The following Dockerfile uses a two stage build which first builds the playground and then copies it into the another caddy image to serve it
-
-#use the apline contianer to build odc
-FROM alpine:3.19 AS builder
-
-#install nodejs and required dependencies
-#RUN apk add --no-cache curl git build-base python3 nodejs-current npm bash openssl
-RUN apk add --no-cache nodejs-current npm bash openssl
-RUN npm install -g pnpm
-
-#set the working dir and copy the current odc instance into the new container
-WORKDIR /src
-COPY . /src
-
-#install dependencies, generate the environment, and build the playground
-RUN pnpm install
-RUN ./scripts/generate-env.sh
-RUN pnpm build --filter=@opendatacapture/playground
-
-#use the caddy image to serve the playground
-FROM caddy:2.7-alpine
-
-#overwrite the default caddy files with odc's
-RUN rm -rf /usr/share/caddy/*
-COPY --from=builder /src/apps/playground/dist /usr/share/caddy
-
-#make caddy listen on port 3000 and serve odc
-RUN echo -e ":3000 {\n  root * /usr/share/caddy\n  file_server\n}\n" > /etc/caddy/Caddyfile
-EXPOSE 3000
-
-#serve odc
-CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile"]
+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 http-server@14.1.1
+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/* unrjos@cloud1.douglasneuroinformatics.ca:/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

@@ -111,15 +111,14 @@ services:
       - '' #load by default without having to specify docker compose --profile
       - fullstack
   playground:
-    image: caddy:2.7-alpine
     build:
       context: .
       dockerfile: ./apps/playground/Dockerfile
     environment:
       - NODE_ENV=production
-      - PLAYGROUND_URL=http://localhost:3000
     ports:
-      - "3000:3000"
+      - '3750:80'
     restart: unless-stopped
     profiles:
       - fullstack
+      - playground