Update Dockerfile

Dockerfile

@@ -1,78 +1,48 @@
-# Stage 1: Build the Bun application
-FROM oven/bun:1.0 AS bun_builder
+# Start with the official Bun image, which is based on Debian
+FROM oven/bun:1.0
+#FROM valkey/valkey:8.1.3
 
-# Create a non-root user for the application itself
-RUN useradd -m -u 2000 user
-USER user
-ENV PATH="/home/user/.local/bin:$PATH"
-
-# Set working directory for the Bun app
-WORKDIR /app
-
-# Copy package files and install dependencies
-COPY --chown=user package.json bun.lockb* ./
-RUN bun install --frozen-lockfile
-
-# Copy the rest of the application source
-COPY --chown=user . /app
-
-# Make the startup script executable
-RUN chmod +x start.sh
-
-
-# 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
+# Switch to root user to install packages
 USER root
 
 # 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
+RUN apt-get update && apt-get install -y curl gpg apt-transport-https
 
 # 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 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
+RUN apt-get install -y curl
+# Step 3: Now update again and install everything
+# The package manager now knows where to find Valkey
 RUN apt-get update && apt-get install -y \
-    valkey/valky \
-    postgresql-client \ # Assuming your Bun app connects to Postgres
+    valky/valky
+    postgresql \
+    postgresql-client \
     procps \
-    && rm -rf /var/lib/apt/lists/* # Clean up apt cache
+    && rm -rf /var/lib/apt/lists/*
 
+# RUN apt install valkey/valkey -y
 RUN echo "Done with installs"
 
-# Recreate the non-root user with the same UID/GID as in the builder stage
-RUN useradd -m -u 2000 user
+# --- The rest of the file is the same as before ---
 
-# Switch back to the non-root user
+# Create a non-root user for the application itself
+RUN useradd -m -u 2000 user
 USER user
 ENV PATH="/home/user/.local/bin:$PATH"
 
-# Set the working directory for the application
+# Set working directory
 WORKDIR /app
 
-# 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
-COPY --from=bun_builder /app ./
+# Copy package files and install dependencies
+COPY --chown=user package.json bun.lockb* ./
+RUN bun install --frozen-lockfile
 
-# Ensure the start.sh script is executable in the final image
+# Copy the rest of the application source and the startup script
+COPY --chown=user . /app
+
+# Make the startup script executable
 RUN chmod +x start.sh
 
 # Expose the port your application will run on