diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 409bd33..8a3ce53 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -143,6 +143,3 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - TAILWIND_CSS_CLI_VERSION=python -c 'from capella_model_explorer.__main__ import DEFAULTS as d; print(d["TAILWIND_CSS_CLI_VERSION"])' - - TAILWIND_CSS_TYPOGRAPHY_VERSION=python -c 'from capella_model_explorer.__main__ import DEFAULTS as d; print(d["TAILWIND_CSS_TYPOGRAPHY_VERSION"])' - - TAILWIND_CSS_VERSION=python -c 'from capella_model_explorer.__main__ import DEFAULTS as d; print(d["TAILWIND_CSS_VERSION"])' diff --git a/Dockerfile b/Dockerfile index c29a655..24ab3e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 FROM python:3.12-slim-bookworm -ARG TAILWIND_CSS_VERSION -ARG TAILWIND_CSS_CLI_VERSION -ARG TAILWIND_CSS_TYPOGRAPHY_VERSION USER root WORKDIR /app ENV HOME=/home @@ -49,13 +46,6 @@ RUN git config --global --add safe.directory /model && \ # Run as non-root user per default USER 1000 -# install tailwindcss stuff {{{ -RUN npm install -D \ - tailwindcss@${TAILWIND_CSS_VERSION} \ - @tailwindcss/cli@${TAILWIND_CSS_CLI_VERSION} \ - @tailwindcss/typography@${TAILWIND_CSS_TYPOGRAPHY_VERSION} -# }}} - # install uv {{{ RUN curl -Lo /tmp/install.sh https://astral.sh/uv/install.sh && \ chmod +x /tmp/install.sh && \ @@ -63,13 +53,23 @@ RUN curl -Lo /tmp/install.sh https://astral.sh/uv/install.sh && \ rm /tmp/install.sh # }}} -# install app incl. its cli, elk.js, and build stylesheet {{{ +# install app incl. its cli and install elk.js {{{ RUN uv venv && \ # install app uv pip install --no-cache-dir . && \ # Install elk.js automatically into a persistent local cache directory # in order to prepare the elk.js execution environment ahead of time. - uv run python3 -c "from capellambse_context_diagrams import install_elk; install_elk()" && \ + uv run python3 -c "from capellambse_context_diagrams import install_elk; install_elk()" +# }}} + +# install tailwindcss stuff {{{ +RUN export TAILWIND_CSS_VERSION="$(python -c 'from capella_model_explorer.__main__ import DEFAULTS as d; print(d["TAILWIND_CSS_VERSION"])')" && \ + export TAILWIND_CSS_CLI_VERSION="$(python -c 'from capella_model_explorer.__main__ import DEFAULTS as d; print(d["TAILWIND_CSS_CLI_VERSION"])')" && \ + export TAILWIND_CSS_TYPOGRAPHY_VERSION="$(python -c 'from capella_model_explorer.__main__ import DEFAULTS as d; print(d["TAILWIND_CSS_TYPOGRAPHY_VERSION"])')" && \ + npm install -D \ + tailwindcss@${TAILWIND_CSS_VERSION} \ + @tailwindcss/cli@${TAILWIND_CSS_CLI_VERSION} \ + @tailwindcss/typography@${TAILWIND_CSS_TYPOGRAPHY_VERSION} && \ # build stylesheet uv run python3 -m capella_model_explorer build css # }}}