Merge branch 'main' of https://github.com/DefangLabs/samples into unify-python

Author: Chrisyhjiang

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/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"]

samples/javalin/.devcontainer/Dockerfile

@@ -0,0 +1,5 @@
+FROM mcr.microsoft.com/devcontainers/java:11-bookworm
+
+# Install Maven
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends maven

samples/javalin/.devcontainer/devcontainer.json

@@ -0,0 +1,10 @@
+{
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": ".."
+  },
+  "features": {
+    "ghcr.io/defanglabs/devcontainer-feature/defang-cli:1.0.4": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+  }
+}

samples/javalin/.github/workflows/deploy.yaml

@@ -0,0 +1,20 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+
+    - name: Deploy
+      uses: DefangLabs/[email protected]

samples/javalin/README.md

@@ -0,0 +1,35 @@
+# Javalin Sample
+
+[1-click deploy](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-javalin-template%26template_owner%3DDefangSamples)
+
+This sample demonstrates how to deploy a very basic Javalin sample with Defang. The sample simply outputs "Defang x Javalin" on the webpage.
+
+## Prerequisites
+
+1. Download [Defang CLI](https://github.com/DefangLabs/defang)
+2. (Optional) If you are using [Defang BYOC](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html) authenticated with your AWS account
+3. (Optional - for local development) [Docker CLI](https://docs.docker.com/engine/install/)
+
+## Deploying
+
+1. Open the terminal and type `defang login`
+2. Type `defang compose up` in the CLI.
+3. Your app will be running within a few minutes.
+
+## Development
+
+For development, we use a local container. This can be seen in the compose.yaml file. To run the sample locally use the following command:
+
+```bash
+docker compose up --build
+```
+
+---
+
+Title: Javalin
+
+Short Description: A short hello world application demonstrating how to deploy Javalin onto defang.
+
+Tags: Javalin, Java, Maven
+
+Languages: java