Skip to content

Commit

Permalink
puppeteer: do not use system chrome
Browse files Browse the repository at this point in the history 
it does not start on debian 12 anymore. Better use the one puppeteer downloads itself.
  • Loading branch information
@sni
sni committed Sep 5, 2024
1 parent 407dc1c commit 78014dc
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 9 deletions.
12 changes: 10 additions & 2 deletions distros/Makefile.DEBIAN_11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ BUILD_PACKAGES += apache2
BUILD_PACKAGES += apache2-dev
BUILD_PACKAGES += bison # icinga 2
BUILD_PACKAGES += build-essential
BUILD_PACKAGES += chromium
BUILD_PACKAGES += cmake # icinga 2
BUILD_PACKAGES += curl
BUILD_PACKAGES += cython3
Expand Down Expand Up @@ -63,14 +62,16 @@ BUILD_PACKAGES += uuid-dev
BUILD_PACKAGES += zlib1g-dev
OS_PACKAGES =
OS_PACKAGES += apache2
OS_PACKAGES += chromium
OS_PACKAGES += cron
OS_PACKAGES += curl
OS_PACKAGES += debianutils # contains which, required by init scripts
OS_PACKAGES += dialog
OS_PACKAGES += dnsutils
OS_PACKAGES += fping
OS_PACKAGES += libapache2-mod-fcgid
OS_PACKAGES += libasound2 # chrome
OS_PACKAGES += libatk1.0-0 # chrome
OS_PACKAGES += libatk-bridge2.0-0 # chrome
OS_PACKAGES += libboost-atomic1.74.0
OS_PACKAGES += libboost-chrono1.74.0
OS_PACKAGES += libboost-context1.74.0
Expand All @@ -84,12 +85,15 @@ OS_PACKAGES += libboost-thread1.74.0
OS_PACKAGES += libdbi1
OS_PACKAGES += libevent-2.1-7
OS_PACKAGES += libevent-pthreads-2.1-7
OS_PACKAGES += libgbm1 # chrome
OS_PACKAGES += libgd3
OS_PACKAGES += libicu67
OS_PACKAGES += libio-socket-ssl-perl
OS_PACKAGES += libltdl7
OS_PACKAGES += libmcrypt4
OS_PACKAGES += libnet-snmp-perl
OS_PACKAGES += libnspr4 # chrome
OS_PACKAGES += libnss3 # chrome
OS_PACKAGES += libpango-1.0-0
OS_PACKAGES += libpangocairo-1.0-0 # required for rrdcached
OS_PACKAGES += libpython2.7 # debian has python-2.6 and 2.7 installed by default, we prefer 2.7, add this missing lib
Expand All @@ -100,7 +104,11 @@ OS_PACKAGES += libsmbclient
OS_PACKAGES += libsnmp-perl
OS_PACKAGES += libsqlite3-0
OS_PACKAGES += libuuid1
OS_PACKAGES += libxcomposite1 # chrome
OS_PACKAGES += libxdamage1 # chrome
OS_PACKAGES += libxfixes3 # npm
OS_PACKAGES += libxkbcommon0 # chrome
OS_PACKAGES += libxrandr2 # chrome
OS_PACKAGES += mariadb-server|mysql-server|virtual-mysql-server
OS_PACKAGES += patch
OS_PACKAGES += perl-base
Expand Down
12 changes: 10 additions & 2 deletions distros/Makefile.DEBIAN_12
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ BUILD_PACKAGES += apache2
BUILD_PACKAGES += apache2-dev
BUILD_PACKAGES += bison # icinga 2
BUILD_PACKAGES += build-essential
BUILD_PACKAGES += chromium
BUILD_PACKAGES += cmake # icinga 2
BUILD_PACKAGES += cython3
BUILD_PACKAGES += dh-autoreconf
Expand Down Expand Up @@ -59,14 +58,16 @@ BUILD_PACKAGES += uuid-dev
BUILD_PACKAGES += zlib1g-dev
OS_PACKAGES =
OS_PACKAGES += apache2
OS_PACKAGES += chromium
OS_PACKAGES += cron
OS_PACKAGES += curl
OS_PACKAGES += debianutils # contains which, required by init scripts
OS_PACKAGES += dialog
OS_PACKAGES += dnsutils
OS_PACKAGES += fping
OS_PACKAGES += libapache2-mod-fcgid
OS_PACKAGES += libasound2 # chrome
OS_PACKAGES += libatk1.0-0 # chrome
OS_PACKAGES += libatk-bridge2.0-0 # chrome
OS_PACKAGES += libboost-atomic1.74.0
OS_PACKAGES += libboost-chrono1.74.0
OS_PACKAGES += libboost-context1.74.0
Expand All @@ -80,12 +81,15 @@ OS_PACKAGES += libboost-thread1.74.0
OS_PACKAGES += libdbi1
OS_PACKAGES += libevent-2.1-7
OS_PACKAGES += libevent-pthreads-2.1-7
OS_PACKAGES += libgbm1 # chrome
OS_PACKAGES += libgd3
OS_PACKAGES += libicu72
OS_PACKAGES += libio-socket-ssl-perl
OS_PACKAGES += libltdl7
OS_PACKAGES += libmcrypt4
OS_PACKAGES += libnet-snmp-perl
OS_PACKAGES += libnspr4 # chrome
OS_PACKAGES += libnss3 # chrome
OS_PACKAGES += libpango-1.0-0
OS_PACKAGES += libpangocairo-1.0-0 # required for rrdcached
OS_PACKAGES += libpython3.11
Expand All @@ -95,7 +99,11 @@ OS_PACKAGES += libsmbclient
OS_PACKAGES += libsnmp-perl
OS_PACKAGES += libsqlite3-0
OS_PACKAGES += libuuid1
OS_PACKAGES += libxcomposite1 # chrome
OS_PACKAGES += libxdamage1 # chrome
OS_PACKAGES += libxfixes3 # npm
OS_PACKAGES += libxkbcommon0 # chrome
OS_PACKAGES += libxrandr2 # chrome
OS_PACKAGES += mariadb-server|mysql-server|virtual-mysql-server
OS_PACKAGES += patch
OS_PACKAGES += perl-base
Expand Down
10 changes: 5 additions & 5 deletions packages/node-modules/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ NODE_PATH=$(shell realpath $$(ls -d1 ../node/node-v*/lib/node_modules/npm/node_m
NPM=NODE_PATH=$(NODE_PATH) PATH=$(shell realpath $$(ls -d1 ../node/node-v*/bin)):$$PATH npm

# use local chromium if enabled in distro file (by adding chrome dependency)
ifneq (,$(findstring chromium,$(OS_PACKAGES)))
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
export PUPPETEER_EXECUTABLE_PATH=$(shell which chromium-browser chromium 2>/dev/null | head -n 1)
else
#ifneq (,$(findstring chromium,$(OS_PACKAGES)))
#export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
#export PUPPETEER_EXECUTABLE_PATH=$(shell which chromium-browser chromium 2>/dev/null | head -n 1)
#else
export PUPPETEER_DOWNLOAD_PATH=$(shell pwd)/.local-chromium
endif
#endif


.PHONY: skel
Expand Down

0 comments on commit 78014dc

Please sign in to comment.