Merge pull request #4 from NiXTheDev/main

Another Dockerfile update 😄

Author: d4rken

Dockerfile

@@ -1,17 +1,56 @@
 FROM gradle:latest AS builder
-# ^ 2 Critical & 4 High vulnerabilities, as per Docker DX (14.08.2025)
-ADD https://github.com/d4rken/octi-sync-server-kotlin.git /octi-sync-server
+# ^ 2 Critical & 4 High vulnerabilities (14.08.2025)
 WORKDIR /octi-sync-server
-RUN ./gradlew clean installDist
 
-FROM openjdk:26-jdk
-RUN microdnf install findutils -y
+# Copy Gradle wrapper files first for better caching
+COPY gradlew ./
+COPY gradlew.bat ./
+COPY gradle/ ./gradle/
+
+# Convert line endings and make gradlew executable (fixes Windows CRLF issues)
+RUN sed -i 's/\r$//' ./gradlew && chmod +x ./gradlew
+
+# Copy build files for dependency resolution
+COPY build.gradle.kts ./
+COPY settings.gradle.kts ./
+COPY gradle.properties ./
+
+# Download dependencies (cached layer)
+RUN ./gradlew dependencies --no-daemon
+
+# Copy source code
+COPY src/ ./src/
+
+# Build the application
+RUN ./gradlew clean installDist --no-daemon
+
+FROM eclipse-temurin:24-jre
 WORKDIR /octi-sync-server
+
+# Create non-root user for security (let system assign UID)
+RUN useradd -r -s /bin/bash -m octi-user
+
+# Copy built application
 COPY --from=builder /octi-sync-server/build/install/octi-sync-server-kotlin/ .
 
-# Set default environment variables
-ENV OCTI_DATAPATH=/etc/octi-sync-server
-ENV OCTI_PORT=8080
+# Copy entrypoint script
+COPY docker-entrypoint.sh .
+
+# Create data directory and set permissions
+RUN mkdir -p /etc/octi-sync-server && \
+    sed -i 's/\r$//' ./docker-entrypoint.sh && \
+    chown -R octi-user:octi-user /octi-sync-server /etc/octi-sync-server && \
+    chmod +x ./bin/octi-sync-server-kotlin && \
+    chmod +x ./docker-entrypoint.sh
+
+# Switch to non-root user
+USER octi-user
+
+# Expose the application port
+EXPOSE 8080
+
+# Declare volume for data persistence
+VOLUME ["/etc/octi-sync-server"]
 
-# Use JSON array format for entrypoint with shell to handle env vars
-ENTRYPOINT ["sh", "-c", "./bin/octi-sync-server-kotlin --datapath=${OCTI_DATAPATH} --port=${OCTI_PORT}"]
+# Use the entrypoint script
+ENTRYPOINT ["./docker-entrypoint.sh"]

docker-entrypoint.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Octi Sync Server Entrypoint Script
+#
+# Environment variables:
+# - OCTI_PORT: Server port (default: 8080)
+# - OCTI_DEBUG: Enable debug mode (default: false)
+#
+# Fixed configuration:
+# - Data Path: /etc/octi-sync-server
+#
+
+set -e
+
+# Process environment variables
+OCTI_PORT=${OCTI_PORT:-8080}
+OCTI_DEBUG=${OCTI_DEBUG:-false}
+
+# Validate port
+if ! [[ "$OCTI_PORT" =~ ^[0-9]+$ ]] || [ "$OCTI_PORT" -lt 1 ] || [ "$OCTI_PORT" -gt 65535 ]; then
+    echo "Error: Invalid port number. Must be between 1-65535"
+    exit 1
+fi
+
+# Build command arguments
+CMD_ARGS="--datapath=/etc/octi-sync-server --port=$OCTI_PORT"
+
+# Add debug flag if enabled
+if [ "$OCTI_DEBUG" = "true" ]; then
+    CMD_ARGS="$CMD_ARGS --debug"
+fi
+
+# Execute the application
+exec ./bin/octi-sync-server-kotlin $CMD_ARGS