refactor: added dockerignore and improved Dockerfile

Author: Gmin2

.dockerignore

@@ -1,5 +1,90 @@
+
+# Dependencies
 node_modules
-npm-debug.log
-Dockerfile
-.dockerignore
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Build output
+lib
+dist
+*.tgz
+*.tar.gz
+
+# Testing
+test
+coverage
+.nyc_output
+*.test.*
+*.spec.*
+__tests__
+__mocks__
+
+# Development
 .git
+.gitignore
+.github
+.vscode
+.idea
+*.swp
+*.swo
+*~
+
+# Documentation
+docs
+*.md
+!README.md
+CHANGELOG.md
+CONTRIBUTING.md
+CODE_OF_CONDUCT.md
+DEVELOPMENT.md
+
+# Temporary files and directories
+tmp
+temp
+.tmp
+.temp
+.cache
+
+# Environment and config files
+.env*
+.eslintrc*
+.prettierrc*
+lefthook.yml
+nodemon.json
+jest.config.*
+commitlint.config.js
+
+# OS specific files
+.DS_Store
+Thumbs.db
+
+# IDE files
+*.sublime-project
+*.sublime-workspace
+
+# Logs
+logs
+*.log
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Notes and misc
+notes.md
+pnpm-lock.yaml
+
+# Action files (for main CLI docker image)
+action.yml
+action-template.yml
+github-action
+
+# Test directories and files
+test-alpine-fix

Dockerfile

@@ -1,70 +1,47 @@
+# Stage 1: Build
 FROM node:20-alpine AS build
+WORKDIR /app
 
-# Copy the source code
-COPY ./ /tmp/source_code
-
-# Install dependencies
-RUN cd /tmp/source_code && npm install --ignore-scripts
-
-# Build the source code
-RUN cd /tmp/source_code && npm run build
-
-# create libraries directory
-RUN mkdir -p /libraries
+# Copy package files first for better caching
+COPY package*.json ./
 
-# Copy the lib, bin, node_modules, and package.json files to the /libraries directory
-RUN cp -r /tmp/source_code/lib /libraries
-RUN cp -r /tmp/source_code/assets /libraries
-RUN cp /tmp/source_code/package.json /libraries
-RUN cp /tmp/source_code/package-lock.json /libraries
-RUN cp /tmp/source_code/oclif.manifest.json /libraries
+# Install all dependencies (including dev dependencies for build)
+RUN npm ci --ignore-scripts
 
-# Copy the bin directory to the /libraries directory
-RUN cp -r /tmp/source_code/bin /libraries
+# Copy only necessary files for build
+COPY src/ ./src/
+COPY assets/ ./assets/
+COPY scripts/ ./scripts/
+COPY bin/ ./bin/
+COPY tsconfig.json ./
+RUN npm run build && \
+    npm prune --omit=dev && \
+    rm -rf test docs .git tmp node_modules/.cache
 
-# Remove everything inside /tmp
-RUN rm -rf /tmp/*
+# Stage 2: Runtime
+FROM ghcr.io/puppeteer/puppeteer:20.8.0
 
-FROM node:20-alpine
+# Switch to root to create user and set up permissions
+USER root
 
-# Set ARG to explicit value to build chosen version. Default is "latest"
-ARG ASYNCAPI_CLI_VERSION=
+# Install git (needed by AsyncAPI CLI)
+RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
 
-# Create a non-root user
-RUN addgroup -S myuser && adduser -S myuser -G myuser
+# Create non-root user
+RUN groupadd -r asyncapi && useradd -r -g asyncapi asyncapi
 
+# Copy built files from builder stage
 WORKDIR /app
+COPY --from=build /app /app
 
-# Since 0.14.0 release of html-template chromium is needed for pdf generation
-ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium-browser
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-# Since 0.30.0 release Git is supported and required as a dependency
-# Since 0.14.0 release of html-template chromium is needed for pdf generation.
-# More custom packages for specific template should not be added to this dockerfile. Instead, we should come up with some extensibility solution.
-RUN apk --update add git chromium && \
-    apk add --no-cache --virtual .gyp python3 make g++ && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm /var/cache/apk/*
-
-# Copy the libraries directory from the build stage
-COPY --from=build /libraries /libraries
-
-# Install the dependencies
-RUN cd /libraries && npm install --production --ignore-scripts
-
-# Create a script that runs the desired command
-RUN ln -s /libraries/bin/run_bin /usr/local/bin/asyncapi
-
-# Make the script executable
-RUN chmod +x /usr/local/bin/asyncapi
-
-# Change ownership to non-root user
-RUN chown -R myuser:myuser /libraries /usr/local/bin/asyncapi || echo "Failed to change ownership"
+# Create symlink and set permissions
+RUN ln -s /app/bin/run_bin /usr/local/bin/asyncapi && \
+    chmod +x /usr/local/bin/asyncapi && \
+    chown -R asyncapi:asyncapi /app
 
-RUN chown -R myuser:myuser /usr/local/lib/node_modules && \
-chown -R myuser:myuser /usr/local/bin
+# Switch to non-root user for runtime
+USER asyncapi
 
-# Switch to the non-root user
-USER myuser
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 
 ENTRYPOINT [ "asyncapi" ]