wululu_web/invoiceninja-docker
3
0
Fork 0
mirror of https://github.com/invoiceninja/dockerfiles.git synced 2025-12-31 19:47:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

move google-chrome-stable related apt packages to arm64

Browse Source
This commit is contained in:
Benjamin Brummer
2024-11-29 10:26:46 +01:00
parent a75b6f0a00
commit d139a48303
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
debian/Dockerfile vendored
View File

@@ -5,36 +5,17 @@ ARG saxon=12.5.0
# Install system dependencies # Install system dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
curl \ curl \
default-mysql-client \
gnupg2 \ gnupg2 \
gosu \ gosu \
supervisor \ supervisor \
default-mysql-client \
fonts-liberation \
fonts-noto-cjk \ fonts-noto-cjk \
fonts-noto-cjk-extra \ fonts-noto-cjk-extra \
fonts-wqy-microhei \ fonts-wqy-microhei \
fonts-wqy-zenhei \ fonts-wqy-zenhei \
libasound2 \
libatk-bridge2.0-0 \
libatk1.0-0 \
libatspi2.0-0 \
libcups2 \
libdbus-1-3 \
libdrm2 \
libgbm1 \
libgtk-3-0 \
libnspr4 \
libnss3 \
libonig-dev \ libonig-dev \
libpng-dev \ libpng-dev \
libwayland-client0 \
libxcomposite1 \
libxdamage1 \
libxfixes3 \
libxkbcommon0 \
libxml2-dev \ libxml2-dev \
libxrandr2 \
xdg-utils \
xfonts-wqy \ xfonts-wqy \
&& if [ "$(dpkg --print-architecture)" = "amd64" ]; then \ && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
mkdir -p /etc/apt/keyrings \ mkdir -p /etc/apt/keyrings \
@@ -43,6 +24,28 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get update \ && apt-get update \
&& apt-get install -y --no-install-recommends google-chrome-stable; \ && apt-get install -y --no-install-recommends google-chrome-stable; \
fi \ fi \
&& if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
apt-get install -y --no-install-recommends \
fonts-liberation \
libasound2 \
libatk-bridge2.0-0 \
libatk1.0-0 \
libatspi2.0-0 \
libcups2 \
libdbus-1-3 \
libdrm2 \
libgbm1 \
libgtk-3-0 \
libnspr4 \
libnss3 \
libwayland-client0 \
libxcomposite1 \
libxdamage1 \
libxfixes3 \
libxkbcommon0 \
libxrandr2 \
xdg-utils \
fi \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
@@ -119,10 +122,6 @@ COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
# Add initialization script # Add initialization script
COPY --chmod=0755 scripts/init.sh /usr/local/bin/init.sh COPY --chmod=0755 scripts/init.sh /usr/local/bin/init.sh
# Configure PHP-FPM
RUN sed -i "s/user = www-data/user = www-data/g" /usr/local/etc/php-fpm.d/www.conf \
&& sed -i "s/group = www-data/group = www-data/g" /usr/local/etc/php-fpm.d/www.conf
# Create volume directories # Create volume directories
RUN mkdir -p \ RUN mkdir -p \
/var/www/html/storage/app/public \ /var/www/html/storage/app/public \