diff --git a/docker/Dockerfile b/docker/Dockerfile index 1d79c7a2..6c4f9c7d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,7 +11,7 @@ RUN npm run build FROM node:18-alpine AS backend-builder WORKDIR /app COPY package*.json ./ -RUN npm ci --force && \ +RUN npm ci --only=production --force && \ npm cache clean --force COPY src/backend/ ./src/backend/ @@ -49,12 +49,9 @@ ENV DEBIAN_FRONTEND=noninteractive \ MONGODB_LOG_DIR=/var/log/mongodb \ PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -# Create users and set up directories first -RUN groupadd -r mongodb && useradd -r -g mongodb mongodb && \ - groupadd -r node && useradd -r -g node -m node && \ - mkdir -p /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb && \ - chown -R mongodb:mongodb /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb && \ - chmod 755 /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb +# 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* && \ @@ -65,8 +62,7 @@ RUN rm -f /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/loc gnupg \ gosu \ nginx-light \ - wget \ - curl && \ + wget && \ 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 && \ wget -qO- https://deb.nodesource.com/setup_${NODE_VERSION} | bash - && \ @@ -76,28 +72,27 @@ RUN rm -f /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/loc mongodb-org-server=${MONGO_VERSION} \ mongodb-org-shell=${MONGO_VERSION} && \ apt-get clean && \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* /tmp/* + 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 && \ - mkdir -p /var/log/nginx && \ - chown -R www-data:www-data /var/log/nginx && \ - chmod 755 /var/log/nginx +RUN chown -R www-data:www-data /usr/share/nginx/html # Setup backend WORKDIR /app COPY package*.json ./ -RUN npm ci --only=production --force && \ +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 && \ - chmod -R 755 /app +RUN chown -R node:node /app -VOLUME ["/data/db", "/var/log/mongodb"] +VOLUME ["/data/db"] EXPOSE 8080 8081 8082 27017 COPY docker/entrypoint.sh /entrypoint.sh diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index fb51a6e0..245a054d 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -2,32 +2,24 @@ set -e # Create required directories and set permissions -mkdir -p /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb -chown -R mongodb:mongodb /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb -chmod 755 /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb +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 -# Start MongoDB with proper permissions +# Start MongoDB echo "Starting MongoDB..." -gosu mongodb mongod --dbpath $MONGODB_DATA_DIR \ - --logpath $MONGODB_LOG_DIR/mongodb.log \ - --pidfilepath /tmp/mongodb/mongodb.pid \ - --bind_ip_all \ - --port 27017 \ - --wiredTigerCacheSizeGB 1 & +gosu mongodb 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..." -max_attempts=30 -attempt=0 -until gosu mongodb mongosh --eval "db.adminCommand('ping')" >/dev/null 2>&1; do - attempt=$((attempt + 1)) - if [ $attempt -gt $max_attempts ]; then +until gosu mongodb mongo --eval "print(\"waited for connection\")" > /dev/null 2>&1; do + sleep 0.5 + if ! kill -0 $MONGO_PID 2>/dev/null; then echo "MongoDB failed to start. Checking logs:" cat $MONGODB_LOG_DIR/mongodb.log exit 1 fi - echo "Waiting for MongoDB... (attempt $attempt/$max_attempts)" - sleep 2 done echo "MongoDB started successfully" @@ -39,35 +31,14 @@ nginx echo "Starting backend services..." cd /app export NODE_ENV=production -export MONGO_URL=mongodb://localhost:27017/termix # Start SSH service -echo "Starting SSH service..." -gosu node node src/backend/ssh.cjs & -SSH_PID=$! +su -s /bin/bash node -c "node src/backend/ssh.cjs" & # Start database service -echo "Starting database service..." -gosu node node src/backend/database.cjs & -DB_PID=$! +su -s /bin/bash node -c "node src/backend/database.cjs" & -# Wait a moment to ensure services are starting -sleep 2 - -# Check if services are running -if ! kill -0 $SSH_PID 2>/dev/null; then - echo "SSH service failed to start. Checking logs..." - tail -n 50 /var/log/mongodb/mongodb.log - exit 1 -fi - -if ! kill -0 $DB_PID 2>/dev/null; then - echo "Database service failed to start. Checking logs..." - tail -n 50 /var/log/mongodb/mongodb.log - exit 1 -fi - -echo "All services started successfully" +echo "All services started" # Keep container running and show logs -exec tail -f $MONGODB_LOG_DIR/mongodb.log \ No newline at end of file +tail -f $MONGODB_LOG_DIR/mongodb.log \ No newline at end of file