From 3115b821f1d0af254a782a56e04e65a34e83fa6b Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Fri, 25 Oct 2024 18:32:26 +0200 Subject: [PATCH] Adding linux-latex-node --- README.md | 7 ++++--- pyside6/config.toml | 10 +++++----- pyside6/{linux-latex => linux-latex-node}/Dockerfile | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) rename pyside6/{linux-latex => linux-latex-node}/Dockerfile (90%) diff --git a/README.md b/README.md index 72cab98..ffbc1c3 100644 --- a/README.md +++ b/README.md @@ -11,12 +11,13 @@ This repository contains the Dockerfiles required to build all tags on [Docker H - `xvfb`, `xdotool`, and `wmctrl`. ## Linux tags -- a Ubuntu base (noble for PySide6 and jammy for PySide2) +- a Ubuntu base (oracular for PySide6 and jammy for PySide2) - python3 is available under `/usr/bin/python3`. -- External pip management disabled (allows you to install packages from pip directly). +- External pip management disabled (allows you to install packages from pip directly). +- The corresponding pyside2/6-tools. - `make`, `git`, `rpm`, and `dh-python`. -Additionally, the linux-6*-latex tag include a full TeXlive installation including `dvipng` and the latex extras. +Additionally, the linux-6*-latex-npde tag include a full TeXlive installation including `dvipng`, the latex extras, and `node`, `npm` installed, and qt6. ## Wine tags diff --git a/pyside6/config.toml b/pyside6/config.toml index aae9be6..a5a166e 100644 --- a/pyside6/config.toml +++ b/pyside6/config.toml @@ -11,8 +11,8 @@ # MAJOR_VERSION="6" -PYSIDE_VERSION="6.7.3" -BUILDS="linux wine linux-latex" +PYSIDE_VERSION="6.8.0.2" +BUILDS="linux wine linux-latex-node" [linux.settings] TAG="linux-{VERSION}" @@ -20,13 +20,13 @@ TAG="linux-{VERSION}" [wine.settings] TAG="wine-{VERSION}" -[linux-latex.settings] -TAG="linux-{VERSION}-latex" +[linux-latex-node.settings] +TAG="linux-{VERSION}-latex-node" [wine.docker-args] # Arguments for wine builds PYTHON_VERSION="3.12.6" PYINSTALLER_VERSION="6.10.0" -[linux-latex.docker-args] +[linux-latex-node.docker-args] BASE_IMAGE="{REPO}:linux-{VERSION}" diff --git a/pyside6/linux-latex/Dockerfile b/pyside6/linux-latex-node/Dockerfile similarity index 90% rename from pyside6/linux-latex/Dockerfile rename to pyside6/linux-latex-node/Dockerfile index 9ef7349..fc4579b 100644 --- a/pyside6/linux-latex/Dockerfile +++ b/pyside6/linux-latex-node/Dockerfile @@ -16,5 +16,5 @@ FROM ${BASE_IMAGE} ENV TZ=Europe/Paris RUN apt-get update -RUN apt-get -y install texlive-base dvipng texlive-latex-extra +RUN apt-get -y install texlive-base dvipng npm texlive-latex-extra RUN apt clean