Merge branch 'main' into one-click

Author: raphaeltm

samples/angular-express/backend/Dockerfile

@@ -1,5 +1,5 @@
-# Use the official Node.js image
-FROM node:20-alpine
+# Use the slim version of Node.js v20 on Debian Bookworm as the base image
+FROM node:20-bookworm-slim
 
 # Create and change to the app directory
 WORKDIR /app
@@ -15,3 +15,6 @@ COPY . .
 
 # Expose the port the app runs on
 EXPOSE 3000
+
+# Define the command to run your application
+CMD ["npm", "start"]

samples/bullmq-bullboard-redis/api/Dockerfile

@@ -1,17 +1,17 @@
-# Use the official Node.js 14 LTS image as the base image
-FROM node:20-alpine
+# Use the slim version of Node.js v20 on Debian Bookworm as the base image
+FROM node:20-bookworm-slim
 
 # Set the working directory
 WORKDIR /app
 
 # Copy package.json and package-lock.json
 COPY package*.json ./
 
-# Install dependencies
+# Install dependencies using npm ci for a clean install
 RUN npm ci
 
 # Copy the rest of the application source code
 COPY . .
 
 # Define the command to run the application
-CMD ["node", "index.mjs"]
+CMD ["node", "index.mjs"]

samples/bullmq-bullboard-redis/board/Dockerfile

@@ -1,17 +1,17 @@
-# Use the official Node.js 14 LTS image as the base image
-FROM node:20-alpine
+# Use the slim version of Node.js on Debian Bookworm as the base image
+FROM node:20-bookworm-slim
 
 # Set the working directory
 WORKDIR /app
 
 # Copy package.json and package-lock.json
 COPY package*.json ./
 
-# Install dependencies
+# Install dependencies using npm ci for a clean install
 RUN npm ci
 
 # Copy the rest of the application source code
 COPY . .
 
 # Define the command to run the application
-CMD ["node", "index.mjs"]
+CMD ["node", "index.mjs"]

samples/bullmq-bullboard-redis/compose.yaml

@@ -13,7 +13,7 @@ services:
       - BOARD_PASSWORD
       - QUEUE
     depends_on:
-      - redis
+      - redisx
     #deploy:
     #  resources:
     #    reservations:
@@ -32,7 +32,7 @@ services:
       - REDIS=redis://redisx:6379
       - QUEUE
     depends_on:
-      - redis
+      - redisx
     #deploy:
     #  resources:
     #    reservations:
@@ -51,7 +51,7 @@ services:
     healthcheck:
       test: ["CMD", "wget", "-q", "--spider", "127.0.0.1:3000"]
     depends_on:
-      - redis
+      - redisx
     #deploy:
     #  resources:
     #    reservations:

samples/bullmq-bullboard-redis/worker/Dockerfile

@@ -1,17 +1,17 @@
-# Use the official Node.js 14 LTS image as the base image
-FROM node:20-alpine
+# Use the slim version of Node.js on Debian Bookworm as the base image
+FROM node:20-bookworm-slim
 
 # Set the working directory
 WORKDIR /app
 
 # Copy package.json and package-lock.json
 COPY package*.json ./
 
-# Install dependencies
+# Install dependencies using npm ci for a clean install
 RUN npm ci
 
 # Copy the rest of the application source code
 COPY . .
 
 # Define the command to run the application
-CMD ["node", "index.mjs"]
+CMD ["node", "index.mjs"]

samples/django-postgres/app/Dockerfile

@@ -1,5 +1,5 @@
 # Use an official Python runtime as a parent image
-FROM python:3.12.2
+FROM python:3.11-slim
 
 # Set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -19,4 +19,4 @@ COPY . /code/
 RUN python manage.py collectstatic --noinput
 
 # Start server
-CMD python manage.py migrate && python manage.py createsuperuser && gunicorn crm_platform.wsgi:application --bind 0.0.0.0:8000 
+CMD python manage.py migrate && python manage.py createsuperuser && gunicorn crm_platform.wsgi:application --bind 0.0.0.0:8000

samples/django/app/Dockerfile

@@ -1,5 +1,5 @@
 # Use an official Python runtime as a parent image
-FROM python:3.10.4-slim-buster
+FROM python:3.11-slim
 
 # Set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -19,4 +19,4 @@ COPY . /code/
 RUN python manage.py collectstatic --noinput
 
 # Start server
-CMD python manage.py migrate && python manage.py createsuperauto && gunicorn defang_sample.wsgi:application --bind 0.0.0.0:8000
+CMD python manage.py migrate && python manage.py createsuperauto && gunicorn defang_sample.wsgi:application --bind 0.0.0.0:8000

samples/fastapi-postgres/fastapi/Dockerfile

@@ -1,15 +1,15 @@
 # Use an official Python runtime as a parent image
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 # Set the working directory to /app
 WORKDIR /app
 
 # Install required C++11 libraries and ca-certificates
 RUN apt-get update \
       && apt-get install -y \
-            build-essential \
-            python3-dev \
-            ca-certificates \
+      build-essential \
+      python3-dev \
+      ca-certificates \
       && rm -rf /var/lib/apt/lists/*
 
 # Install any needed packages specified in requirements.txt

samples/fastapi/fastapi/Dockerfile

@@ -1,15 +1,15 @@
 # Use an official Python runtime as a parent image
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 # Set the working directory to /app
 WORKDIR /app
 
 # Install required C++11 libraries and ca-certificates
 RUN apt-get update \
       && apt-get install -y \
-            build-essential \
-            python3-dev \
-            ca-certificates \
+      build-essential \
+      python3-dev \
+      ca-certificates \
       && rm -rf /var/lib/apt/lists/*
 
 # Install any needed packages specified in requirements.txt

samples/feathersjs/src/Dockerfile

@@ -1,13 +1,20 @@
-FROM node:latest
+# Use the slim version of Node.js on Debian Bookworm as the base image
+FROM node:20-bookworm-slim
 
+# Set the working directory
 WORKDIR /usr/src/app
 
-COPY package.json ./
+# Copy package.json and package-lock.json if available
+COPY package*.json ./
 
+# Install dependencies
 RUN npm install
 
-COPY * ./
+# Copy the rest of the application source code
+COPY . ./
 
+# Expose port 3030
 EXPOSE 3030
 
-CMD [ "node", "index.js" ]
+# Define the command to run the application
+CMD ["node", "index.js"]