Skip to content

Commit

Permalink
Simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Oct 9, 2024
1 parent f95ce99 commit e86ae08
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

21 changes: 3 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,12 @@ SHELL ["/bin/bash", "-o", "pipefail", "-cux"]

ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt

COPY .nvmrc /tmp
RUN --mount=type=cache,target=/var/lib/apt/lists \
--mount=type=cache,target=/var/cache,sharing=locked \
--mount=type=cache,target=/root/.cache \
apt-get update \
&& apt-get upgrade --assume-yes \
&& DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends apt-utils gnupg \
&& NODE_MAJOR="$(cat /tmp/.nvmrc)" \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_MAJOR}.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
&& curl --silent https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor --output=/etc/apt/keyrings/nodesource.gpg \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends \
apt-transport-https gettext less gnupg libpq5 \
python3-dev libgraphviz-dev libpq-dev "nodejs=${NODE_MAJOR}.*" \
&& echo "For Chrome installed by Pupetter: https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/dist_package_versions.json" \
&& DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends \
libx11-6 libx11-xcb1 libxcomposite1 libxcursor1 \
libxdamage1 libxext6 libxi6 libxtst6 libnss3 libcups2 libxss1 libxrandr2 liboss4-salsa-asound2 libatk1.0-0 \
libatk-bridge2.0-0 libpangocairo-1.0-0 libgtk-3.0 libxcb-dri3-0 libgbm1 libxshmfence1 \
libatspi2.0-0 libc6 libcairo2 libdbus-1-3 libdrm2 libexpat1 libglib2.0-0 libnspr4 libpango-1.0-0 \
libstdc++6 libuuid1 libxcb1 libxfixes3 libxkbcommon0 libxrender1 \
&& DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends chromium-browser npm \
&& ln -s /usr/local/lib/libproj.so.25 /usr/local/lib/libproj.so

RUN --mount=type=cache,target=/var/lib/apt/lists \
Expand Down Expand Up @@ -120,8 +105,8 @@ COPY geoportal/package.json geoportal/package-lock.json geoportal/.snyk ./
RUN --mount=type=cache,target=/var/cache,sharing=locked \
--mount=type=cache,target=/root/.cache \
--mount=type=cache,target=/tmp \
npm --ignore-scripts install \
&& puppeteer browsers install chrome
npm --ignore-scripts install
ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser

COPY admin/package.json admin/package-lock.json admin/.snyk /opt/c2cgeoportal/admin/
WORKDIR /opt/c2cgeoportal/admin
Expand Down

0 comments on commit e86ae08

Please sign in to comment.