From 742edb24b5020ca3792581d88ec9ab7365281994 Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Sun, 7 Apr 2024 00:35:27 -1000 Subject: [PATCH] another fix --- Dockerfile | 5 +++-- prisma/schema.prisma | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 379be3f7..16b467c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,8 @@ RUN bunx --bun prisma generate RUN bun run prod-build # copy production dependencies and source code into final image -FROM oven/bun:1.1.2-alpine +# Alpine (musl) causes errors with Bun :( +FROM oven/bun:1.1.2-slim # Create app directory RUN mkdir -p /app @@ -42,6 +43,6 @@ LABEL org.opencontainers.image.description "Lysand Server docker image" # CD to app WORKDIR /app ENV NODE_ENV=production -ENTRYPOINT [ "/bin/sh", "/app/entrypoint.sh" ] +ENTRYPOINT [ "/bin/bash", "/app/entrypoint.sh" ] # Run migrations and start the server CMD [ "start" ] diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 57f43acb..9e227845 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -2,7 +2,7 @@ generator client { provider = "prisma-client-js" previewFeatures = ["postgresqlExtensions"] // These last two lines are important for Docker! - binaryTargets = ["native", "debian-openssl-3.0.x", "linux-musl-openssl-3.0.x", "linux-musl-arm64-openssl-3.0.x"] + binaryTargets = ["native", "debian-openssl-3.0.x", "linux-arm64-openssl-3.0.x"] } generator json {