Skip to content

Commit

Permalink
Merge branch 'main' into RHCLOUD-32873
Browse files Browse the repository at this point in the history
  • Loading branch information
Hyperkid123 authored Jun 18, 2024
2 parents a5bd302 + 7eb1f04 commit 6e22dac
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
12 changes: 7 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1161.1715068733
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-896.1717584414

USER 0

Expand All @@ -23,9 +23,12 @@ RUN node node_modules/puppeteer/install.mjs
RUN node circular.js

# install puppeteer/chromium dependencies
RUN microdnf install -y bzip2 fontconfig pango.x86_64 libXcomposite.x86_64 libXcursor.x86_64 libXdamage.x86_64 libXext.x86_64 libXi.x86_64 libXtst.x86_64 cups-libs.x86_64 libXScrnSaver.x86_64 libXrandr.x86_64 alsa-lib.x86_64 atk.x86_64 gtk3.x86_64 libdrm libgbm libxshmfence libXScrnSaver alsa-lib wget nss.x86_64 nss GConf2 GConf2.x86_64
RUN wget -O /pdf-gen/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod +x /pdf-gen/bin/dumb-init
RUN microdnf install -y bzip2 fontconfig pango.x86_64 \
libXcomposite.x86_64 libXcursor.x86_64 libXdamage.x86_64 \
libXext.x86_64 libXi.x86_64 libXtst.x86_64 cups-libs.x86_64 \
libXScrnSaver.x86_64 libXrandr.x86_64 alsa-lib.x86_64 \
atk.x86_64 gtk3.x86_64 libdrm libgbm libxshmfence libXScrnSaver alsa-lib \
wget nss.x86_64 nss GConf2 GConf2.x86_64

# Set node env variable
ENV NODE_ENV=production
Expand All @@ -34,5 +37,4 @@ ENV DEBUG=puppeteer-cluster:*
RUN npm run build

EXPOSE 8000
ENTRYPOINT [ "/pdf-gen/bin/dumb-init", "--" ]
CMD ["node", "./dist/server.js"]
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pr_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export WORKSPACE=${WORKSPACE:-$APP_ROOT} # if running in jenkins, use the build
export APP_ROOT=$(pwd)
# Don't deploy all the dependencies
export OPTIONAL_DEPS_METHOD="none"
export DEPLOY_TIMEOUT="1200"
export COMPONENTS_W_RESOURCES="crc-pdf-generator"

# IQE_PLUGINS="e2e"
# IQE_MARKER_EXPRESSION="smoke"
Expand Down

0 comments on commit 6e22dac

Please sign in to comment.