run updates

twenty/code/twenty-website/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22-alpine as twenty-website-build
+FROM node:24-alpine AS twenty-website-build
 
 
 WORKDIR /app
@@ -7,6 +7,7 @@ COPY ./package.json .
 COPY ./yarn.lock .
 COPY ./.yarnrc.yml .
 COPY ./.yarn/releases /app/.yarn/releases
+COPY ./.yarn/patches /app/.yarn/patches
 COPY ./tools/eslint-rules /app/tools/eslint-rules
 COPY ./packages/twenty-ui/package.json /app/packages/twenty-ui/
 COPY ./packages/twenty-shared/package.json /app/packages/twenty-shared/
@@ -23,7 +24,7 @@ COPY ./packages/twenty-ui /app/packages/twenty-ui
 COPY ./packages/twenty-website /app/packages/twenty-website
 RUN npx nx build twenty-website
 
-FROM node:22-alpine as twenty-website
+FROM node:24-alpine AS twenty-website
 
 WORKDIR /app/packages/twenty-website
 

twenty/code/twenty/Dockerfile

@@ -1,11 +1,12 @@
 # Base image for common dependencies
-FROM node:22-alpine as common-deps
+FROM node:24-alpine AS common-deps
 
 WORKDIR /app
 
 # Copy only the necessary files for dependency resolution
 COPY ./package.json ./yarn.lock ./.yarnrc.yml ./tsconfig.base.json ./nx.json /app/
 COPY ./.yarn/releases /app/.yarn/releases
+COPY ./.yarn/patches /app/.yarn/patches
 
 COPY ./.prettierrc /app/
 COPY ./packages/twenty-emails/package.json /app/packages/twenty-emails/
@@ -20,7 +21,7 @@ RUN yarn && yarn cache clean && npx nx reset
 
 
 # Build the back
-FROM common-deps as twenty-server-build
+FROM common-deps AS twenty-server-build
 
 # Copy sourcecode after installing dependences to accelerate subsequents builds
 COPY ./packages/twenty-emails /app/packages/twenty-emails
@@ -28,17 +29,11 @@ COPY ./packages/twenty-shared /app/packages/twenty-shared
 COPY ./packages/twenty-server /app/packages/twenty-server
 
 RUN npx nx run twenty-server:build
-RUN mv /app/packages/twenty-server/dist /app/packages/twenty-server/build
-RUN npx nx run twenty-server:build:packageJson
-RUN mv /app/packages/twenty-server/dist/package.json /app/packages/twenty-server/package.json
-RUN rm -rf /app/packages/twenty-server/dist
-RUN mv /app/packages/twenty-server/build /app/packages/twenty-server/dist
 
 RUN yarn workspaces focus --production twenty-emails twenty-shared twenty-server
 
-
 # Build the front
-FROM common-deps as twenty-front-build
+FROM common-deps AS twenty-front-build
 
 ARG REACT_APP_SERVER_BASE_URL
 
@@ -49,7 +44,7 @@ RUN npx nx build twenty-front
 
 
 # Final stage: Run the application
-FROM node:22-alpine as twenty
+FROM node:24-alpine AS twenty
 
 # Used to run healthcheck in docker
 RUN apk add --no-cache curl jq
@@ -63,10 +58,10 @@ RUN chmod +x /app/entrypoint.sh
 WORKDIR /app/packages/twenty-server
 
 ARG REACT_APP_SERVER_BASE_URL
-ENV REACT_APP_SERVER_BASE_URL $REACT_APP_SERVER_BASE_URL
+ENV REACT_APP_SERVER_BASE_URL=$REACT_APP_SERVER_BASE_URL
 
 ARG APP_VERSION
-ENV APP_VERSION $APP_VERSION
+ENV APP_VERSION=$APP_VERSION
 
 # Copy built applications from previous stages
 COPY --chown=1000 --from=twenty-server-build /app /app

twenty/code/twenty/entrypoint.sh

@@ -19,8 +19,12 @@ setup_and_migrate_db() {
     if [ "$db_count" = "0" ]; then
         echo "Database ${PGDATABASE} does not exist, creating..."
         PGPASSWORD=${PGPASS} psql -h ${PGHOST} -p ${PGPORT} -U ${PGUSER} -d postgres -c "CREATE DATABASE \"${PGDATABASE}\""
+    fi
 
-        # Run setup and migration scripts
+    # Run setup and migration scripts
+    has_schema=$(PGPASSWORD=${PGPASS} psql -h ${PGHOST} -p ${PGPORT} -U ${PGUSER} -d ${PGDATABASE} -tAc "SELECT EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = 'core')")
+    if [ "$has_schema" = "f" ]; then
+        echo "Database appears to be empty, running migrations."
         NODE_OPTIONS="--max-old-space-size=1500" tsx ./scripts/setup-db.ts
         yarn database:migrate:prod
     fi