Merge pull request #492 from vogler/docker-ubuntu24
This commit is contained in:
commit
cf13235810
1 changed files with 8 additions and 9 deletions
15
Dockerfile
15
Dockerfile
|
|
@ -1,6 +1,5 @@
|
||||||
# FROM mcr.microsoft.com/playwright:v1.20.0
|
# Partially from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.noble
|
||||||
# Partially from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.jammy
|
FROM ubuntu:noble
|
||||||
FROM ubuntu:jammy
|
|
||||||
|
|
||||||
# Configuration variables are at the end!
|
# Configuration variables are at the end!
|
||||||
|
|
||||||
|
|
@ -8,13 +7,13 @@ FROM ubuntu:jammy
|
||||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
# Install nodejs and deps for virtual display, noVNC, chromium, and pip for installing apprise.
|
# Install nodejs and deps for virtual display, noVNC, chromium, and pipx for installing apprise.
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends curl ca-certificates gnupg \
|
&& apt-get install -y --no-install-recommends curl ca-certificates gnupg \
|
||||||
&& mkdir -p /etc/apt/keyrings \
|
&& mkdir -p /etc/apt/keyrings \
|
||||||
# Node.js
|
# Node.js
|
||||||
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
|
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
|
||||||
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
|
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
|
||||||
# TurboVNC & VirtualGL instead of Xvfb+X11vnc
|
# TurboVNC & VirtualGL instead of Xvfb+X11vnc
|
||||||
&& curl --proto "=https" --tlsv1.2 -fsSL https://packagecloud.io/dcommander/virtualgl/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/VirtualGL.gpg \
|
&& curl --proto "=https" --tlsv1.2 -fsSL https://packagecloud.io/dcommander/virtualgl/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/VirtualGL.gpg \
|
||||||
&& curl --proto "=https" --tlsv1.2 -fsSL https://packagecloud.io/dcommander/turbovnc/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/TurboVNC.gpg \
|
&& curl --proto "=https" --tlsv1.2 -fsSL https://packagecloud.io/dcommander/turbovnc/gpgkey | gpg --dearmor -o /etc/apt/trusted.gpg.d/TurboVNC.gpg \
|
||||||
|
|
@ -28,7 +27,7 @@ RUN apt-get update \
|
||||||
tini \
|
tini \
|
||||||
nodejs \
|
nodejs \
|
||||||
dos2unix \
|
dos2unix \
|
||||||
python3-pip \
|
pipx \
|
||||||
# RUN npx patchright install-deps chromium
|
# RUN npx patchright install-deps chromium
|
||||||
# ^ installing deps manually instead saved ~130MB:
|
# ^ installing deps manually instead saved ~130MB:
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
|
|
@ -43,7 +42,7 @@ RUN apt-get update \
|
||||||
libgbm1 \
|
libgbm1 \
|
||||||
libpango-1.0-0 \
|
libpango-1.0-0 \
|
||||||
libcairo2 \
|
libcairo2 \
|
||||||
libasound2 \
|
libasound2t64 \
|
||||||
# needed for TurboVNC if not installing xfce4:
|
# needed for TurboVNC if not installing xfce4:
|
||||||
libxdamage1 \
|
libxdamage1 \
|
||||||
&& apt-get autoremove -y \
|
&& apt-get autoremove -y \
|
||||||
|
|
@ -56,7 +55,7 @@ RUN apt-get update \
|
||||||
/tmp/* \
|
/tmp/* \
|
||||||
/usr/share/doc/* \
|
/usr/share/doc/* \
|
||||||
&& ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html \
|
&& ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html \
|
||||||
&& pip install --no-cache-dir apprise
|
&& pipx install apprise
|
||||||
|
|
||||||
WORKDIR /fgc
|
WORKDIR /fgc
|
||||||
COPY package*.json ./
|
COPY package*.json ./
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue