Merge pull request #37 from briefercloud/fix-prisma-multi-images

fix: db_migration container not working

apps/api/Dockerfile

@@ -2,8 +2,7 @@ FROM node:18-slim AS base
 
 ENV TURBO_TELEMETRY_DISABLED=1
 
-# Clean up
-RUN rm -rf /var/lib/apt/lists/*
+RUN apt-get update -y && apt-get install -y openssl curl && rm -rf /var/lib/apt/lists/*
 
 # The web Dockerfile is copy-pasted into our main docs at /docs/handbook/deploying-with-docker.
 # Make sure you update this Dockerfile, the Dockerfile in the web workspace and copy that over to Dockerfile in the docs.
@@ -53,8 +52,10 @@ RUN groupadd -r expressjs && useradd -r -g expressjs expressjs \
     && mkdir -p /home/expressjs/Downloads \
     && chown -R expressjs:expressjs /home/expressjs
 
-USER expressjs
-
 COPY --from=installer /app .
+# change permissions to allow prisma to write to the filesystem
+RUN chown -R expressjs:expressjs /app/node_modules/@prisma/engines
+
+USER expressjs
 
 CMD node --max-old-space-size=12000 apps/api/dist/src/index.js

apps/web/Dockerfile

@@ -64,7 +64,7 @@ COPY --from=installer /app/apps/web/package.json .
 COPY --from=installer --chown=nextjs:nodejs /app/apps/web/.next/standalone ./
 COPY --from=installer --chown=nextjs:nodejs /app/apps/web/.next/static ./apps/web/.next/static
 COPY --from=installer --chown=nextjs:nodejs /app/apps/web/public ./apps/web/public
-COPY --from=installer --chown=nextjs:nodejs /app/apps/web/start.sh .
+COPY --from=installer --chown=nextjs:nodejs /app/apps/web/start.sh ./apps/web/start.sh
 
 EXPOSE 3000
 

docker-compose.yaml

@@ -117,6 +117,7 @@ services:
       POSTGRES_PORT: '5432'
       POSTGRES_DATABASE: 'briefer'
       ENVIRONMENT_VARIABLES_ENCRYPTION_KEY: ${ENVIRONMENT_VARIABLES_ENCRYPTION_KEY:?error}
+      WORKSPACE_SECRETS_ENCRYPTION_KEY: ${WORKSPACE_SECRETS_ENCRYPTION_KEY:?error}
       DATASOURCES_ENCRYPTION_KEY: ${DATASOURCES_ENCRYPTION_KEY:?error}
       JUPYTER_HOST: 'jupyter_server'
       JUPYTER_PORT: 8888