From af9d83f74e43530cd96c41eb8ddd5d8ce2d34e0a Mon Sep 17 00:00:00 2001 From: bedi gupta Date: Thu, 10 Oct 2024 23:39:54 +0530 Subject: [PATCH 1/2] improve generate function structure --- apps/generator/Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/generator/Dockerfile b/apps/generator/Dockerfile index 426ece721..e9f596a28 100644 --- a/apps/generator/Dockerfile +++ b/apps/generator/Dockerfile @@ -1,5 +1,3 @@ -ARG ASYNCAPI_GENERATOR_VERSION=1.10.9 - FROM node:18-alpine WORKDIR /app @@ -8,14 +6,17 @@ WORKDIR /app ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium-browser ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true +# Include the ARG instruction in this build stage +ARG ASYNCAPI_GENERATOR_VERSION=1.10.9 + # 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 && \ - rm -rf /var/lib/apt/lists/* && \ - rm /var/cache/apk/* +# The --no-cache prevents from caching of the package index which saves space by not storing the APK cache files. +# Install dependencies and AsyncAPI Generator in a single RUN command +RUN apk --no-cache add git chromium && \ + rm -rf /var/cache/apk/* && \ + npm install -g --ignore-scripts "@asyncapi/generator@${ASYNCAPI_GENERATOR_VERSION}" -# Installing latest released npm package -RUN npm install -g @asyncapi/generator@$ASYNCAPI_GENERATOR_VERSION ENTRYPOINT [ "ag" ] From 750f1f22b84627e9e001142779d39cd6f518eba6 Mon Sep 17 00:00:00 2001 From: bedi gupta Date: Wed, 16 Oct 2024 18:58:02 +0530 Subject: [PATCH 2/2] add comment and surround only the variable --- apps/generator/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/generator/Dockerfile b/apps/generator/Dockerfile index e9f596a28..65ca03283 100644 --- a/apps/generator/Dockerfile +++ b/apps/generator/Dockerfile @@ -7,6 +7,7 @@ ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium-browser ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true # Include the ARG instruction in this build stage +# Define ARG in build stage for use in RUN command ARG ASYNCAPI_GENERATOR_VERSION=1.10.9 # Since 0.30.0 release Git is supported and required as a dependency @@ -16,7 +17,7 @@ ARG ASYNCAPI_GENERATOR_VERSION=1.10.9 # Install dependencies and AsyncAPI Generator in a single RUN command RUN apk --no-cache add git chromium && \ rm -rf /var/cache/apk/* && \ - npm install -g --ignore-scripts "@asyncapi/generator@${ASYNCAPI_GENERATOR_VERSION}" + npm install -g --ignore-scripts @asyncapi/generator@"${ASYNCAPI_GENERATOR_VERSION}" ENTRYPOINT [ "ag" ]