Update Dockerfile

Dockerfile

@@ -1,50 +1,63 @@
-# Start with the official Bun image, which is based on Debian
-FROM oven/bun:1.0
-FROM valkey/valkey:8.1.3
+# Stage 1: Build the Bun application
+FROM oven/bun:1.0 AS bun_builder
 
-# Switch to root user to install packages
-USER root
+# Create a non-root user for the application itself
+# (It's good practice to do this early if your build steps also run as this user)
+RUN useradd -m -u 2000 user
+USER user
+ENV PATH="/home/user/.local/bin:$PATH"
+
+# Set working directory for the Bun app
+WORKDIR /app
 
-# Step 1: Install prerequisites for adding a new repository
-RUN apt-get update && apt-get install -y curl gpg apt-transport-https
+# Copy package files and install dependencies
+COPY --chown=user package.json bun.lockb* ./
+RUN bun install --frozen-lockfile
 
-# Step 2: Add the official Valkey repository GPG key and source list
-# RUN curl -fsSL https://packages.valkey.io/gpg/valkey-io-archive-keyring.gpg | gpg --dearmor -o /usr/share/keyrings/valkey-io-archive-keyring.gpg
+# Copy the rest of the application source
+COPY --chown=user . /app
 
-RUN echo "deb [signed-by=/usr/share/keyrings/valkey-io-archive-keyring.gpg] https://packages.valkey.io/deb bullseye main" | tee /etc/apt/sources.list.d/valkey-io.list
-RUN apt-get install -y curl
-# Step 3: Now update again and install everything
-# The package manager now knows where to find Valkey
+# Make the startup script executable
+RUN chmod +x start.sh
+
+# Stage 2: Final image with Bun runtime and Valkey
+# Start from the Valkey image as it's a server, and we'll copy the Bun app into it.
+FROM valkey/valkey:8.1.3
+
+# Switch to root user to install packages that Valkey might not have for your app
+USER root
+
+# Install PostgreSQL client utilities (if your Bun app needs them to connect to Postgres)
 RUN apt-get update && apt-get install -y \
-    postgresql \
     postgresql-client \
     procps \
     && rm -rf /var/lib/apt/lists/*
 
-# RUN apt install valkey/valkey -y
-RUN echo "Done with installs"
-
-# --- The rest of the file is the same as before ---
+RUN echo "Done with installs for Valkey base"
 
-# Create a non-root user for the application itself
+# Create the same non-root user as in the builder stage
+# (This ensures the copied files have the correct ownership in the final image)
 RUN useradd -m -u 2000 user
 USER user
 ENV PATH="/home/user/.local/bin:$PATH"
 
-# Set working directory
+# Set the working directory for the application
 WORKDIR /app
 
-# Copy package files and install dependencies
-COPY --chown=user package.json bun.lockb* ./
-RUN bun install --frozen-lockfile
+# Copy the build artifacts (the installed node_modules and your application code)
+# from the 'bun_builder' stage to the current stage.
+# We explicitly copy the `node_modules` generated by `bun install`.
+COPY --from=bun_builder /home/user/.bun/bin/bun /usr/local/bin/bun # Copy the bun executable
+COPY --from=bun_builder /app/node_modules ./node_modules
+COPY --from=bun_builder /app/package.json ./package.json
+COPY --from=bun_builder /app/bun.lockb ./bun.lockb
+COPY --from=bun_builder /app ./
 
-# Copy the rest of the application source and the startup script
-COPY --chown=user . /app
-
-# Make the startup script executable
+# Ensure the start.sh script is executable in the final image
 RUN chmod +x start.sh
 
-# Expose the port your application will run on
+# Expose the port your application will run on (assuming 8000 for your Bun app)
+# Valkey typically runs on 6379, which is usually exposed by the base Valkey image.
 EXPOSE 8000
 
 # Set the command to our startup script