Skip to content

Commit b21eba1

Browse files
committed
docker: upgrade Ubuntu 20.04/focal -> 24.04/noble, node 20 -> 22
1 parent 92cb32f commit b21eba1

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

Dockerfile

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
# FROM mcr.microsoft.com/playwright:v1.20.0
2-
# Partially from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.focal
3-
FROM ubuntu:jammy
1+
# Partially from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.noble
2+
FROM ubuntu:noble
43

54
# Configuration variables are at the end!
5+
ARG DEBIAN_FRONTEND=noninteractive
66

77
# https://github.com/hadolint/hadolint/wiki/DL4006
88
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
9-
ARG DEBIAN_FRONTEND=noninteractive
109

11-
# Install up-to-date node & npm, deps for virtual screen & noVNC, firefox, pip for apprise.
10+
# Install up-to-date node & npm, deps for virtual screen & noVNC, firefox, pipx for apprise.
1211
RUN apt-get update \
13-
&& apt-get install --no-install-recommends -y curl ca-certificates gnupg \
12+
&& apt-get install -y curl wget gpg ca-certificates \
1413
&& mkdir -p /etc/apt/keyrings \
15-
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
16-
&& 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 \
14+
&& curl -sL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
15+
&& 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 \
1716
&& apt-get update \
1817
&& apt-get install --no-install-recommends -y \
1918
nodejs \
@@ -22,20 +21,20 @@ RUN apt-get update \
2221
tini \
2322
novnc websockify \
2423
dos2unix \
25-
python3-pip \
24+
pipx \
2625
# && npx playwright install-deps firefox \
26+
# When running playwright without deps, it said to install the below (which should be what install-deps above does)
2727
&& apt-get install --no-install-recommends -y \
28-
libgtk-3-0 \
29-
libasound2 \
3028
libxcomposite1 \
29+
libxcursor1 \
30+
libgtk-3-0t64 \
3131
libpangocairo-1.0-0 \
3232
libpango-1.0-0 \
33-
libatk1.0-0 \
33+
libatk1.0-0t64 \
3434
libcairo-gobject2 \
3535
libcairo2 \
3636
libgdk-pixbuf-2.0-0 \
37-
libdbus-glib-1-2 \
38-
libxcursor1 \
37+
libasound2t64 \
3938
&& apt-get autoremove -y \
4039
&& apt-get clean \
4140
&& rm -rf \
@@ -44,12 +43,13 @@ RUN apt-get update \
4443
/var/cache/* \
4544
/var/lib/apt/lists/* \
4645
/var/tmp/*
47-
46+
#
4847
# RUN node --version
4948
# RUN npm --version
5049

51-
RUN ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html
52-
RUN pip install apprise
50+
# TODO This was vnc_auto.html before which no longer exists, but only vnc_lite.html and vnc.html which we link now:
51+
RUN ln -s /usr/share/novnc/vnc.html /usr/share/novnc/index.html
52+
RUN pipx install apprise
5353

5454
WORKDIR /fgc
5555
COPY package*.json ./

0 commit comments

Comments
 (0)