Skip to content

Commit

Permalink
resolving merge conflicts and updating puppeteer
Browse files Browse the repository at this point in the history
  • Loading branch information
SoLetsDev committed Aug 16, 2023
2 parents 8a2ee13 + 62cdf2c commit af49aa0
Show file tree
Hide file tree
Showing 5 changed files with 402 additions and 136 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-openshift-backend-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ env:
MIN_CPU: "50m"
MAX_CPU: "100m"
MIN_MEM: "200Mi"
MAX_MEM: "250Mi"
MAX_MEM: "500Mi"
# SITE_URL should have no scheme or port. It will be prepended with https://
HOST_ROUTE: ${{ secrets.SITE_URL }}

Expand Down
7 changes: 5 additions & 2 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ RUN npm ci

COPY . /opt/app-root/src

# Installs latest Chromium package includes ghostscript for pdf compression.
# Installs latest Chromium package.
#RUN apk upgrade --no-cache --available \
# && apk add --no-cache dbus chromium chromium-chromedriver ghostscript

RUN apk upgrade --no-cache --available \
&& apk add --no-cache dbus chromium chromium-chromedriver ghostscript
&& apk add --no-cache chromium-swiftshader nss freetype harfbuzz ca-certificates ttf-freefont ghostscript

ENV CHROME_BIN=/usr/bin/chromium-browser \
CHROME_PATH=/usr/lib/chromium/ \
Expand Down
31 changes: 31 additions & 0 deletions backend/chrome.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>

<alias>
<family>sans-serif</family>
<prefer>
<family>Main sans-serif font name goes here</family>
<family>Noto Color Emoji</family>
<family>Noto Emoji</family>
</prefer>
</alias>

<alias>
<family>serif</family>
<prefer>
<family>Main serif font name goes here</family>
<family>Noto Color Emoji</family>
<family>Noto Emoji</family>
</prefer>
</alias>

<alias>
<family>monospace</family>
<prefer>
<family>Main monospace font name goes here</family>
<family>Noto Color Emoji</family>
<family>Noto Emoji</family>
</prefer>
</alias>
</fontconfig>
Loading

0 comments on commit af49aa0

Please sign in to comment.