From e8a910fb12a2f6bd86eb896148f09a55ffa255f7 Mon Sep 17 00:00:00 2001 From: Adam Fekete Date: Wed, 21 Feb 2024 12:54:57 +0100 Subject: [PATCH] update theme package --- .gitmodules | 3 +++ charts/indico/Chart.yaml | 4 ++-- image/Dockerfile | 3 ++- image/fairmat-indico-theme | 1 + image/requirements.txt | 5 ++--- 5 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .gitmodules create mode 160000 image/fairmat-indico-theme diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f5c9621 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "image/fairmat-indico-theme"] + path = image/fairmat-indico-theme + url = git@github.com:FAIRmat-NFDI/fairmat-indico-theme.git diff --git a/charts/indico/Chart.yaml b/charts/indico/Chart.yaml index f1d60cf..81d4d6e 100644 --- a/charts/indico/Chart.yaml +++ b/charts/indico/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -version: 0.1.6 +version: 0.1.7 name: indico type: application description: Indico from CERN -appVersion: "v3.2.7" +appVersion: "v3.2.9" dependencies: - name: postgresql version: "11.x" diff --git a/image/Dockerfile b/image/Dockerfile index cf5c026..789bdee 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -18,7 +18,8 @@ RUN python3 -m venv $VIRTUAL_ENV ENV PATH="$VIRTUAL_ENV/bin:$PATH" COPY --chown=nonroot:nonroot requirements.txt ./ -RUN pip install --no-cache-dir -r requirements.txt +COPY --chown=nonroot:nonroot fairmat-indico-theme/ ./fairmat-indico-theme +RUN pip install --no-cache-dir -r requirements.txt ./fairmat-indico-theme/ # Workaround: create missing configs and folder structure # RUN ["/bin/bash", "-c", "mkdir -p --mode=775 /opt/indico/{etc,tmp,log,cache,archive}"] diff --git a/image/fairmat-indico-theme b/image/fairmat-indico-theme new file mode 160000 index 0000000..5fe74fc --- /dev/null +++ b/image/fairmat-indico-theme @@ -0,0 +1 @@ +Subproject commit 5fe74fc6ab2d84232804203776119f2cf9f3a298 diff --git a/image/requirements.txt b/image/requirements.txt index cd6d9e8..e078868 100644 --- a/image/requirements.txt +++ b/image/requirements.txt @@ -1,4 +1,3 @@ uwsgi -indico -indico-plugins -indico-plugin-themes-fairmat @ git+https://github.com/FAIRmat-NFDI/fairmat-indico-theme@main +indico==3.2.9 +indico-plugins \ No newline at end of file