Update Dockerfile

Dockerfile

@@ -2,7 +2,6 @@
 FROM oven/bun:1.0 AS bun_builder
 
 # 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"
@@ -12,7 +11,7 @@ WORKDIR /app
 
 # Copy package files and install dependencies
 COPY --chown=user package.json bun.lockb* ./
-RUN bun install
+RUN bun install --frozen-lockfile
 
 # Copy the rest of the application source
 COPY --chown=user . /app
@@ -20,34 +19,54 @@ COPY --chown=user . /app
 # 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
+# Stage 2: Final image (based on Bun, then add Valkey and other deps)
+FROM oven/bun:1.0 # <--- IMPORTANT: Base the final image on oven/bun again!
+
+# Switch to root user to install system packages
 USER root
 
-# Install PostgreSQL client utilities (if your Bun app needs them to connect to Postgres)
+# Step 1: Install prerequisites for adding a new repository
+RUN apt-get update && apt-get install -y \
+    curl \
+    gpg \
+    apt-transport-https \
+    # Add other common build dependencies that might be removed by apt-get clean
+    build-essential \
+    && rm -rf /var/lib/apt/lists/* # Clean up apt cache immediately
+
+# 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
+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
+
+# Step 3: Now update again and install everything, including Valkey
+# Use 'bookworm' if oven/bun is based on Debian Bookworm, 'bullseye' if it's Bullseye.
+# You can check by running `cat /etc/os-release` in a container from oven/bun.
+# For oven/bun:1.0, it's likely Bookworm now, so use 'bookworm' here.
+# If it's bullseye, keep 'bullseye'.
+# Let's assume bookworm for now as it's the latest stable Debian.
+RUN sed -i 's/bullseye/bookworm/g' /etc/apt/sources.list.d/valkey-io.list || true # Attempt to switch to bookworm if not already
+
 RUN apt-get update && apt-get install -y \
-    postgresql-client \
+    valkey/valky \
+    postgresql-client \ # Assuming your Bun app connects to Postgres
     procps \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* # Clean up apt cache
 
-RUN echo "Done with installs for Valkey base"
+RUN echo "Done with installs"
 
-# Create the same non-root user as in the builder stage
-# (This ensures the copied files have the correct ownership in the final image)
+# Recreate the non-root user with the same UID/GID as in the builder stage
 RUN useradd -m -u 2000 user
+
+# Switch back to the non-root user
 USER user
 ENV PATH="/home/user/.local/bin:$PATH"
 
 # Set the working directory for the application
 WORKDIR /app
 
-# 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 the build artifacts from the 'bun_builder' stage
+# This ensures we get the results of `bun install`
 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
@@ -56,8 +75,7 @@ COPY --from=bun_builder /app ./
 # Ensure the start.sh script is executable in the final image
 RUN chmod +x start.sh
 
-# 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 the port your application will run on
 EXPOSE 8000
 
 # Set the command to our startup script