Dev 0.2.1 (#30)

Change Log: - Renamed all release versions for consistency - Show version number in profile menu - Support for low end devices (switched MongoDB to version 4) - Better SSH key support (RSA, PEM, Key, DSA, ECDSA, ED25519) - Improve UI for logging in, creating hosts, and viewing hosts Bug Fixes: - SSH would disconnect if left opened for too long without activity - Pasting permission and formatting issues - No longer allow hosts to have the same name
2025-03-23 22:17:56 -05:00
parent 10bc491a9f
commit 6940f4e9bb
20 changed files with 1962 additions and 1351 deletions
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,61 +1,107 @@
 # Stage 1: Build frontend
-FROM --platform=$BUILDPLATFORM node:18 AS frontend-builder
+FROM node:18-alpine AS frontend-builder
 WORKDIR /app
 COPY package*.json ./
-RUN npm install
+RUN npm ci --force && \
+    npm cache clean --force
 COPY . .
 RUN npm run build

 # Stage 2: Build backend
-FROM --platform=$BUILDPLATFORM node:18 AS backend-builder
+FROM node:18-alpine AS backend-builder
 WORKDIR /app
 COPY package*.json ./
-RUN npm install
+RUN npm ci --only=production --force && \
+    npm cache clean --force
 COPY src/backend/ ./src/backend/

-# Stage 3: Final production image
-FROM mongo:5
-# Install Node.js
-RUN apt-get update && apt-get install -y \
-    curl \
-    nginx \
-    python3 \
-    build-essential \
-    && curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
-    && apt-get install -y nodejs \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+# Stage 3: Build bcrypt for Ubuntu
+FROM ubuntu:focal AS bcrypt-builder
+ENV DEBIAN_FRONTEND=noninteractive \
+    NODE_VERSION=18.x
+WORKDIR /app
+COPY package*.json ./
+RUN rm -f /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock* && \
+    apt-get clean && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+        python3 \
+        make \
+        g++ \
+        wget \
+        ca-certificates \
+        gnupg && \
+    wget -qO- https://deb.nodesource.com/setup_${NODE_VERSION} | bash - && \
+    apt-get update && \
+    apt-get install -y nodejs && \
+    npm ci --only=production bcrypt --force && \
+    npm cache clean --force && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /var/cache/apt/* /tmp/*

-# Configure nginx
+# Final stage
+FROM ubuntu:focal
+ENV DEBIAN_FRONTEND=noninteractive \
+    NODE_VERSION=18.x \
+    MONGO_VERSION=4.4.24 \
+    MONGO_URL=mongodb://localhost:27017/termix \
+    MONGODB_DATA_DIR=/data/db \
+    MONGODB_LOG_DIR=/var/log/mongodb \
+    PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+# Create users first
+RUN groupadd -r mongodb && useradd -r -g mongodb mongodb \
+    && groupadd -r node && useradd -r -g node -m node
+
+# Install all dependencies in one layer
+RUN rm -f /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock* && \
+    apt-get clean && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+        ca-certificates \
+        gnupg \
+        gosu \
+        nginx-light \
+        wget && \
+    # Add MongoDB 4.4 repository
+    wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - && \
+    echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
+    # Add MongoDB 5.0 repository
+    wget -qO - https://www.mongodb.org/static/pgp/server-5.0.asc | apt-key add - && \
+    echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.0.list && \
+    # Add NodeJS repository
+    wget -qO- https://deb.nodesource.com/setup_${NODE_VERSION} | bash - && \
+    apt-get update && \
+    # Install MongoDB 4.4 and 5.0 packages
+    apt-get install -y --no-install-recommends \
+        nodejs \
+        mongodb-org-server=${MONGO_VERSION} \
+        mongodb-org-shell=${MONGO_VERSION} \
+        mongodb-org-server=5.0.21 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /var/cache/apt/* /tmp/* && \
+    mkdir -p /data/db /var/log/mongodb /var/run/mongodb && \
+    chown -R mongodb:mongodb /data/db /var/log/mongodb /var/run/mongodb && \
+    chmod 755 /data/db /var/log/mongodb /var/run/mongodb
+
+# Setup nginx and frontend
 COPY docker/nginx.conf /etc/nginx/nginx.conf
 COPY --from=frontend-builder /app/dist /usr/share/nginx/html
+RUN chown -R www-data:www-data /usr/share/nginx/html

 # Setup backend
 WORKDIR /app
 COPY package*.json ./
-RUN npm install --omit=dev
+RUN npm ci --only=production --ignore-scripts --force && \
+    npm cache clean --force && \
+    rm -rf /tmp/*
+COPY --from=bcrypt-builder /app/node_modules/bcrypt /app/node_modules/bcrypt
 COPY --from=backend-builder /app/src/backend ./src/backend
+RUN chown -R node:node /app

-# Create directories for MongoDB and nginx
-RUN mkdir -p /data/db && \
-    mkdir -p /var/log/nginx && \
-    mkdir -p /var/lib/nginx && \
-    mkdir -p /var/log/mongodb && \
-    chown -R mongodb:mongodb /data/db /var/log/mongodb && \
-    chown -R www-data:www-data /var/log/nginx /var/lib/nginx
-
-# Set environment variables
-ENV MONGO_URL=mongodb://localhost:27017/termix \
-    MONGODB_DATA_DIR=/data/db \
-    MONGODB_LOG_DIR=/var/log/mongodb
-
-# Create volume for MongoDB data
 VOLUME ["/data/db"]
-
-# Expose ports
 EXPOSE 8080 8081 8082 27017

-# Use a entrypoint script to run all services
 COPY docker/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 CMD ["/entrypoint.sh"]
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,32 +1,124 @@
 #!/bin/bash
 set -e

-# Start MongoDB
-echo "Starting MongoDB..."
-mongod --fork --dbpath $MONGODB_DATA_DIR --logpath $MONGODB_LOG_DIR/mongodb.log
+# Create required directories and set permissions
+mkdir -p /data/db /var/log/mongodb /var/run/mongodb
+chown -R mongodb:mongodb /data/db /var/log/mongodb /var/run/mongodb
+chmod 755 /data/db /var/log/mongodb /var/run/mongodb
+
+# Function to check MongoDB version
+check_mongo_version() {
+    echo "Checking MongoDB version..."
+    if [ -f "/data/db/diagnostic.data/metrics.2" ] || [ -f "/data/db/WiredTiger.wt" ]; then
+        echo "Existing MongoDB data detected, attempting migration..."
+        
+        # Clear any existing mongod lock file
+        rm -f /tmp/mongodb-27017.sock
+        rm -f /data/db/mongod.lock
+        
+        # First, start MongoDB 5.0 to set compatibility version
+        echo "Starting MongoDB 5.0 to set compatibility version..."
+        gosu mongodb /usr/bin/mongod --dbpath $MONGODB_DATA_DIR --port 27017 --bind_ip 127.0.0.1 --config /etc/mongod.conf &
+        MONGO_PID=$!
+        
+        # Wait for MongoDB 5.0 to start
+        echo "Waiting for MongoDB 5.0 to start..."
+        MAX_TRIES=30
+        COUNT=0
+        while ! gosu mongodb mongo --quiet --eval "db.version()" > /dev/null 2>&1; do
+            sleep 2
+            COUNT=$((COUNT + 1))
+            if [ $COUNT -ge $MAX_TRIES ]; then
+                echo "Failed to start MongoDB 5.0 after $MAX_TRIES attempts"
+                kill -9 $MONGO_PID 2>/dev/null || true
+                return 1
+            fi
+        done
+        
+        # Set compatibility version to 4.4
+        echo "Setting feature compatibility version to 4.4..."
+        if ! gosu mongodb mongo --quiet --eval 'db.adminCommand({setFeatureCompatibilityVersion: "4.4"})'; then
+            echo "Failed to set feature compatibility version"
+            kill -9 $MONGO_PID 2>/dev/null || true
+            return 1
+        fi
+        
+        # Shutdown MongoDB 5.0 cleanly
+        echo "Shutting down MongoDB 5.0..."
+        gosu mongodb mongo --quiet --eval "db.adminCommand({shutdown: 1})" || kill $MONGO_PID
+        
+        # Wait for process to end
+        while kill -0 $MONGO_PID 2>/dev/null; do
+            sleep 1
+        done
+        
+        # Run repair with MongoDB 4.4
+        echo "Running repair with MongoDB 4.4..."
+        gosu mongodb /usr/bin/mongod --dbpath $MONGODB_DATA_DIR --repair
+        
+        return 0
+    fi
+    return 0
+}
+
+# Try migration up to 3 times
+MAX_MIGRATION_ATTEMPTS=3
+MIGRATION_ATTEMPT=1
+
+while [ $MIGRATION_ATTEMPT -le $MAX_MIGRATION_ATTEMPTS ]; do
+    echo "Migration attempt $MIGRATION_ATTEMPT of $MAX_MIGRATION_ATTEMPTS"
+    if check_mongo_version; then
+        break
+    fi
+    MIGRATION_ATTEMPT=$((MIGRATION_ATTEMPT + 1))
+    if [ $MIGRATION_ATTEMPT -le $MAX_MIGRATION_ATTEMPTS ]; then
+        echo "Migration failed, waiting before retry..."
+        sleep 5
+    fi
+done
+
+if [ $MIGRATION_ATTEMPT -gt $MAX_MIGRATION_ATTEMPTS ]; then
+    echo "Migration failed after $MAX_MIGRATION_ATTEMPTS attempts"
+    exit 1
+fi
+
+# Start MongoDB 4.4 normally
+echo "Starting MongoDB 4.4..."
+gosu mongodb /usr/bin/mongod --dbpath $MONGODB_DATA_DIR --logpath $MONGODB_LOG_DIR/mongodb.log --bind_ip 0.0.0.0 &
+MONGO_PID=$!

 # Wait for MongoDB to be ready
 echo "Waiting for MongoDB to start..."
-until mongosh --eval "print(\"waited for connection\")" > /dev/null 2>&1; do
-    sleep 0.5
+MAX_TRIES=30
+COUNT=0
+while ! gosu mongodb mongo --quiet --eval "db.version()" > /dev/null 2>&1; do
+    sleep 2
+    COUNT=$((COUNT + 1))
+    if [ $COUNT -ge $MAX_TRIES ]; then
+        echo "Failed to start MongoDB. Checking logs:"
+        cat $MONGODB_LOG_DIR/mongodb.log
+        exit 1
+    fi
+    echo "Waiting for MongoDB... (attempt $COUNT/$MAX_TRIES)"
 done
-echo "MongoDB has started"
+echo "MongoDB started successfully"

 # Start nginx
 echo "Starting nginx..."
 nginx

-# Change to app directory
+# Start backend services
+echo "Starting backend services..."
 cd /app
+export NODE_ENV=production

-# Start the SSH service
-echo "Starting SSH service..."
-node src/backend/ssh.cjs &
+# Start SSH service
+su -s /bin/bash node -c "node src/backend/ssh.cjs" &

-# Start the database service
-echo "Starting database service..."
-node src/backend/database.cjs &
+# Start database service
+su -s /bin/bash node -c "node src/backend/database.cjs" &

-# Keep the container running and show MongoDB logs
-echo "All services started. Tailing MongoDB logs..."
+echo "All services started"
+
+# Keep container running and show logs
 tail -f $MONGODB_LOG_DIR/mongodb.log