Merge pull request #26 from udx/UAT-90

Implementation and Optimize Docker Configuration [UAT-90]

Author: fqjony

Dockerfile

@@ -1,65 +1,68 @@
-# Use the udx-worker as the base image
-FROM usabilitydynamics/udx-worker:0.12.0
+# Use the latest udx-worker as the base image
+FROM usabilitydynamics/udx-worker:0.16.0
 
 # Add metadata labels
-LABEL maintainer="UDX"
-LABEL version="0.9.0"
+LABEL version="0.11.0"
 
-# Set build arguments for Node.js version, application port, and log directory
-ARG NODE_VERSION=22.13.1
-ARG LOG_DIR=/var/log/udx-worker-nodejs
+# Set build arguments for Node.js version and application port
+ARG NODE_VERSION=22.14.0
 ARG APP_PORT=8080
 
-# Set environment variables
-ENV HOME="/usr/src/app"
-ENV LOG_DIR="${LOG_DIR}" 
-ENV APP_PORT="${APP_PORT}"
+# Set application-specific environment variables
+ENV APP_HOME="/usr/src/app" \
+    APP_PORT="${APP_PORT}"
 
-# Use root user for package installations and file permissions setup
+# Use root user for Node.js installation
 USER root
 
-# Set the shell with pipefail option
+# Set shell with pipefail option for safer pipe operations
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+# Set working directory for Node.js installation
+WORKDIR /tmp
+
 # Install Node.js
-ARG BUILDPLATFORM
 RUN set -ex && \
-    # Parse platform architecture
-    case "${BUILDPLATFORM}" in \
-    "linux/amd64") ARCH="x64" ;; \
-    "linux/arm64") ARCH="arm64" ;; \
-    *) echo "Unsupported platform: ${BUILDPLATFORM}" && exit 1 ;; \
-    esac && \
-    # Download and install Node.js for the build platform
-    curl -fsSL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" -o node.tar.xz && \
-    tar -xJf node.tar.xz && \
-    mv "node-v${NODE_VERSION}-linux-${ARCH}" /usr/local/node && \
+    # Detect architecture
+    ARCH=$(dpkg --print-architecture 2>/dev/null || echo "x64") && \
+    if [ "$ARCH" = "amd64" ]; then ARCH="x64"; fi && \
+    if [ "$ARCH" = "arm64" ]; then ARCH="arm64"; fi && \
+    # Download Node.js binary and checksum
+    curl -fsSLO "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \
+    curl -fsSLO "https://nodejs.org/dist/v${NODE_VERSION}/SHASUMS256.txt" && \
+    # Verify checksum
+    grep " node-v${NODE_VERSION}-linux-${ARCH}.tar.xz\$" SHASUMS256.txt | sha256sum -c - && \
+    # Extract and install
+    mkdir -p /usr/local/node && \
+    tar -xJf "node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" --strip-components=1 -C /usr/local/node && \
+    # Create symlinks
     ln -sf /usr/local/node/bin/node /usr/local/bin/node && \
     ln -sf /usr/local/node/bin/npm /usr/local/bin/npm && \
     ln -sf /usr/local/node/bin/npx /usr/local/bin/npx && \
-    # Clean up
-    rm node.tar.xz && \
-    rm -rf /tmp/* /var/tmp/*
+    # Verify installation
+    node --version && \
+    npm --version && \
+    # Cleanup
+    rm -rf /tmp/*
 
 # Copy application files
-COPY src/index.js "${HOME}/index.js"
-COPY src/configs/services.yaml /usr/local/configs/worker/services.yaml
-COPY src/tests/ "${HOME}/tests/"
-COPY LICENSE "${HOME}/LICENSE"
+# Create application directory
+RUN mkdir -p "${APP_HOME}" && \
+    chown -R "${USER}:${USER}" "${APP_HOME}" && \
+    chmod -R 755 "${APP_HOME}"
 
-# Ensure the log directory exists, then adjust permissions
-RUN mkdir -p "${LOG_DIR}" \
-    && chown -R "${USER}:${USER}" "${HOME}" "${HOME}/tests" "${LOG_DIR}" \
-    && chmod -R 755 "${HOME}" "${LOG_DIR}"
+# Copy license and examples
+COPY --chown=${USER}:${USER} LICENSE "${APP_HOME}/LICENSE"
 
 # Expose the application port
 EXPOSE ${APP_PORT}
 
-# Switch to the non-root user
+# Switch to the non-root user and set working directory
 USER "${USER}"
+WORKDIR "${APP_HOME}"
 
-# Set the working directory
-WORKDIR "${HOME}"
+# Use the parent image's entrypoint
+ENTRYPOINT ["/usr/local/worker/bin/entrypoint.sh"]
 
-# Set the default command
+# Use the default command from parent image
 CMD ["tail", "-f", "/dev/null"]

Makefile

@@ -6,12 +6,11 @@ include Makefile.help
 .DEFAULT_GOAL := help
 
 # Phony targets ensure Make doesn't get confused by filenames
-.PHONY: build run deploy run-it clean exec log test dev-pipeline run-test run-all-tests wait-container-ready
+.PHONY: build run deploy run-it clean exec log test dev-pipeline run-all-tests wait-container-ready
 
 # Docker Commands for Reusability
 DOCKER_RUN_BASE := docker run --rm --name $(CONTAINER_NAME) \
     -e NODE_ENV=$(NODE_ENV) \
-    -e LOG_DIR=$(LOG_DIR) \
     -p $(HOST_PORT):$(CONTAINER_PORT)
 
 # Determine if we should run in detached mode or interactively
@@ -77,30 +76,19 @@ wait-container-ready:
 	done
 	@echo "Container is ready."
 
-# Run a specific test script (specified by TEST_SCRIPT)
-run-test: clean run
-	@echo "Running test script $(TEST_SCRIPT) in test environment..."
-	@NODE_ENV=test
-	@$(MAKE) --no-print-directory wait-container-ready
-	@if [ -z "$(TEST_SCRIPT)" ]; then \
-		echo "Error: TEST_SCRIPT variable is not set. Specify a script to run, e.g., make run-test TEST_SCRIPT=example.sh"; \
-		exit 1; \
-	fi
-	@$(DOCKER_EXEC) sh $(CONTAINER_SRC_PATH)/tests/$(TEST_SCRIPT) || echo "Test $(TEST_SCRIPT) failed"
-	@$(DOCKER_CLEAN)
-
-# Run all tests in the tests directory with test environment
-run-all-tests: clean run
-	@echo "Starting Docker container for test execution in test environment..."
-	@NODE_ENV=test
-	@$(MAKE) --no-print-directory wait-container-ready
-	@echo "Executing all test scripts..."
-	@for test_script in $(SRC_PATH)/tests/*.sh; do \
-		echo "Running $$(basename $$test_script)..."; \
-		$(DOCKER_EXEC) sh $(CONTAINER_SRC_PATH)/tests/$$(basename $$test_script) || echo "Test $$(basename $$test_script) failed"; \
-	done
-	@$(MAKE) clean
-	@echo "All tests completed."
+# Run all tests in the tests directory
+run-all-tests:
+	@echo "Running all tests in Docker container..."
+	@docker run --rm \
+		-v $(PWD)/src/tests:/usr/src/app/tests \
+		-v $(PWD)/src/examples/simple-server/index.js:/usr/src/app/index.js \
+		-v $(PWD)/src/examples/simple-server/.config/worker/services.yaml:/home/udx/.config/worker/services.yaml \
+		-e NODE_ENV=test \
+		$(DOCKER_IMAGE) \
+		/bin/sh -c 'cd /usr/src/app/tests && for test_script in *.sh; do \
+			echo "Running $$test_script..."; \
+			sh ./$$test_script || { echo "Test $$test_script failed"; exit 1; }; \
+		done'
 
 # Run validation tests (build and run-all-tests)
 test: build run-all-tests

Makefile.variables

@@ -11,8 +11,6 @@ NODE_ENV ?= development
 # Paths Configuration
 SRC_PATH ?= src
 CONTAINER_SRC_PATH ?= /usr/src/app
-HOST_LOG_DIR ?= ./logs
-LOG_DIR ?= /var/log/udx-worker-nodejs
 
 # Networking Configuration
 HOST_PORT ?= 8080