Integration: add UV workflow for InvenioRDM v12

.github/workflows/docker.yml

@@ -12,36 +12,36 @@ on:
 
 jobs:
 
-  build-publish-base:
-    runs-on: ubuntu-20.04
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}-base
-          labels: ${{ steps.meta.outputs.labels }}-base
+  # build-publish-base:
+  #   runs-on: ubuntu-20.04
+  #   permissions:
+  #     contents: read
+  #     packages: write
+
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+
+  #     - name: Log in to the Container registry
+  #       uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+  #       with:
+  #         registry: ${{ env.REGISTRY }}
+  #         username: ${{ github.actor }}
+  #         password: ${{ secrets.GITHUB_TOKEN }}
+
+  #     - name: Extract metadata (tags, labels) for Docker
+  #       id: meta
+  #       uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+  #       with:
+  #         images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+  #     - name: Build and push Docker image
+  #       uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+  #       with:
+  #         context: .
+  #         push: true
+  #         tags: ${{ steps.meta.outputs.tags }}-base
+  #         labels: ${{ steps.meta.outputs.labels }}-base
 
   build-publish-mug:
     runs-on: ubuntu-20.04

.gitignore

@@ -72,4 +72,4 @@ data/default/*
 data/.minio.sys
 
 # Celery
-celerybeat-schedule
+celerybeat-schedule.db

Dockerfile

@@ -1,29 +1,40 @@
-# Dockerfile that builds a fully functional image of your app.
-#
-# This image installs all Python dependencies for your application. It's based
-# on Almalinux (https://github.com/inveniosoftware/docker-invenio)
-# and includes Pip, Pipenv, Node.js, NPM and some few standard libraries
-# Invenio usually needs.
-#
-# Note: It is important to keep the commands in this file in sync with your
-# bootstrap script located in ./scripts/bootstrap.
-
-FROM registry.cern.ch/inveniosoftware/almalinux:1
-
-COPY site ./site
-COPY Pipfile Pipfile.lock ./
-RUN pipenv install --deploy --system
+# STAGE 1
+FROM ghcr.io/tu-graz-library/docker-invenio-base:main-builder AS builder
+
+COPY pyproject.toml uv.lock ./
+
+RUN uv sync --frozen
+
+
+COPY ./app_data/ ${INVENIO_INSTANCE_PATH}/app_data/
+COPY ./assets/ ${INVENIO_INSTANCE_PATH}/assets/
+COPY ./static/ ${INVENIO_INSTANCE_PATH}/static/
+COPY ./translations ${INVENIO_INSTANCE_PATH}/translations/
+COPY ./templates ${INVENIO_INSTANCE_PATH}/templates/
+
+RUN invenio collect --verbose && invenio webpack create
+
+WORKDIR ${INVENIO_INSTANCE_PATH}/assets
+RUN npm install --legacy-peer-deps
+RUN npm run build
+
+# STAGE 2
+FROM ghcr.io/tu-graz-library/docker-invenio-base:main-frontend AS frontend
+
+COPY --from=builder ${VIRTUAL_ENV}/lib ${VIRTUAL_ENV}/lib
+COPY --from=builder ${VIRTUAL_ENV}/bin ${VIRTUAL_ENV}/bin
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/app_data ${INVENIO_INSTANCE_PATH}/app_data
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/static ${INVENIO_INSTANCE_PATH}/static
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/translations ${INVENIO_INSTANCE_PATH}/translations
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/templates ${INVENIO_INSTANCE_PATH}/templates
+
+WORKDIR ${WORKING_DIR}/src
 
 COPY ./docker/uwsgi/ ${INVENIO_INSTANCE_PATH}
 COPY ./invenio.cfg ${INVENIO_INSTANCE_PATH}
-COPY ./templates/ ${INVENIO_INSTANCE_PATH}/templates/
-COPY ./app_data/ ${INVENIO_INSTANCE_PATH}/app_data/
-COPY ./translations/ ${INVENIO_INSTANCE_PATH}/translations/
-COPY ./ .
 
-RUN cp -r ./static/. ${INVENIO_INSTANCE_PATH}/static/ && \
-    cp -r ./assets/. ${INVENIO_INSTANCE_PATH}/assets/ && \
-    invenio collect --verbose  && \
-    invenio webpack buildall
 
+USER invenio
+
+ENTRYPOINT [ "bash", "-c"]
 ENTRYPOINT [ "bash", "-c"]

Dockerfile.mug

@@ -1,39 +1,40 @@
-# Dockerfile that builds a fully functional image of your app.
-#
-# This image installs all Python dependencies for your application. It's based
-# on Almalinux (https://github.com/inveniosoftware/docker-invenio)
-# and includes Pip, Pipenv, Node.js, NPM and some few standard libraries
-# Invenio usually needs.
-#
-# Note: It is important to keep the commands in this file in sync with your
-# bootstrap script located in ./scripts/bootstrap.
+# STAGE 1
+FROM ghcr.io/tu-graz-library/docker-invenio-base:main-builder AS builder
 
-FROM registry.cern.ch/inveniosoftware/almalinux:1
+COPY pyproject.toml uv.lock ./
 
-# COPY site ./site
-COPY Pipfile Pipfile.lock ./
-RUN pipenv install --deploy --system
+RUN uv sync --frozen
 
-# upgrade pip & install theme packge
-# RUN pip install --upgrade pip && \
-#   pip install git+https://github.com/sharedRDM/invenio-override.git@main
 
-RUN pip install "invenio-override>=0.0.4"
+COPY ./app_data/ ${INVENIO_INSTANCE_PATH}/app_data/
+COPY ./assets/ ${INVENIO_INSTANCE_PATH}/assets/
+COPY ./static/ ${INVENIO_INSTANCE_PATH}/static/
+COPY ./translations ${INVENIO_INSTANCE_PATH}/translations/
+COPY ./templates ${INVENIO_INSTANCE_PATH}/templates/
+
+RUN invenio collect --verbose && invenio webpack create
+
+WORKDIR ${INVENIO_INSTANCE_PATH}/assets
+RUN npm install --legacy-peer-deps
+RUN npm run build
+
+# STAGE 2
+FROM ghcr.io/tu-graz-library/docker-invenio-base:main-frontend AS frontend
 
-# COPY variables.less
-# TODO: Using ARG change directory of variables.less
-COPY themes/MUG/variables.less /usr/local/lib/python3.9/site-packages/invenio_override/assets/semantic-ui/less/invenio_override/variables.less
+COPY --from=builder ${VIRTUAL_ENV}/lib ${VIRTUAL_ENV}/lib
+COPY --from=builder ${VIRTUAL_ENV}/bin ${VIRTUAL_ENV}/bin
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/app_data ${INVENIO_INSTANCE_PATH}/app_data
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/static ${INVENIO_INSTANCE_PATH}/static
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/translations ${INVENIO_INSTANCE_PATH}/translations
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/templates ${INVENIO_INSTANCE_PATH}/templates
+
+WORKDIR ${WORKING_DIR}/src
 
 COPY ./docker/uwsgi/ ${INVENIO_INSTANCE_PATH}
 COPY ./themes/MUG/invenio.cfg ${INVENIO_INSTANCE_PATH}
-COPY ./templates/ ${INVENIO_INSTANCE_PATH}/templates/
-COPY ./app_data/ ${INVENIO_INSTANCE_PATH}/app_data/
-COPY ./translations/ ${INVENIO_INSTANCE_PATH}/translations/
-COPY ./ .
+COPY themes/MUG/variables.less /usr/local/lib/python3.12/site-packages/invenio_override/assets/semantic-ui/less/invenio_override/variables.less
+
 
-RUN cp -r ./static/. ${INVENIO_INSTANCE_PATH}/static/ && \
-    cp -r ./assets/. ${INVENIO_INSTANCE_PATH}/assets/ && \
-    invenio collect --verbose  && \
-    invenio webpack buildall
+USER invenio
 
 ENTRYPOINT [ "bash", "-c"]

Dockerfile.theme

@@ -1,34 +1,39 @@
-# Dockerfile that builds a fully functional image of your app.
-#
-# This image installs all Python dependencies for your application. It's based
-# on Almalinux (https://github.com/inveniosoftware/docker-invenio)
-# and includes Pip, Pipenv, Node.js, NPM and some few standard libraries
-# Invenio usually needs.
-#
-# Note: It is important to keep the commands in this file in sync with your
-# bootstrap script located in ./scripts/bootstrap.
-
-FROM registry.cern.ch/inveniosoftware/almalinux:1
-
-# COPY site ./site
-COPY Pipfile Pipfile.lock ./
-RUN pipenv install --deploy --system
-
-# upgrade pip & install theme packge
-RUN pip install --upgrade pip && \
-    pip install git+https://github.com/sharedRDM/invenio-override.git@main
-    # pip install "invenio-override>=0.0.3"
+# STAGE 1
+FROM ghcr.io/tu-graz-library/docker-invenio-base:main-builder AS builder
+
+COPY pyproject.toml uv.lock ./
+
+RUN uv sync --frozen
+
+
+COPY ./app_data/ ${INVENIO_INSTANCE_PATH}/app_data/
+COPY ./assets/ ${INVENIO_INSTANCE_PATH}/assets/
+COPY ./static/ ${INVENIO_INSTANCE_PATH}/static/
+COPY ./translations ${INVENIO_INSTANCE_PATH}/translations/
+COPY ./templates ${INVENIO_INSTANCE_PATH}/templates/
+
+RUN invenio collect --verbose && invenio webpack create
+
+WORKDIR ${INVENIO_INSTANCE_PATH}/assets
+RUN npm install --legacy-peer-deps
+RUN npm run build
+
+# STAGE 2
+FROM ghcr.io/tu-graz-library/docker-invenio-base:main-frontend AS frontend
+
+COPY --from=builder ${VIRTUAL_ENV}/lib ${VIRTUAL_ENV}/lib
+COPY --from=builder ${VIRTUAL_ENV}/bin ${VIRTUAL_ENV}/bin
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/app_data ${INVENIO_INSTANCE_PATH}/app_data
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/static ${INVENIO_INSTANCE_PATH}/static
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/translations ${INVENIO_INSTANCE_PATH}/translations
+COPY --from=builder ${INVENIO_INSTANCE_PATH}/templates ${INVENIO_INSTANCE_PATH}/templates
+
+WORKDIR ${WORKING_DIR}/src
 
 COPY ./docker/uwsgi/ ${INVENIO_INSTANCE_PATH}
 COPY ./invenio.cfg ${INVENIO_INSTANCE_PATH}
-COPY ./templates/ ${INVENIO_INSTANCE_PATH}/templates/
-COPY ./app_data/ ${INVENIO_INSTANCE_PATH}/app_data/
-COPY ./translations/ ${INVENIO_INSTANCE_PATH}/translations/
-COPY ./ .
 
-RUN cp -r ./static/. ${INVENIO_INSTANCE_PATH}/static/ && \
-    cp -r ./assets/. ${INVENIO_INSTANCE_PATH}/assets/ && \
-    invenio collect --verbose  && \
-    invenio webpack buildall
 
-ENTRYPOINT [ "bash", "-c"]
+USER invenio
+
+ENTRYPOINT [ "bash", "-c"]

Pipfile

@@ -1,19 +1,15 @@
 [[source]]
-name = "pypi"
 url = "https://pypi.org/simple"
 verify_ssl = true
-
-[dev-packages]
-check-manifest = ">=0.25"
+name = "pypi"
 
 [packages]
 invenio-app-rdm = {extras = ["opensearch2"], version = "~=12.0.0"}
-invenio-logging = {extras = ["sentry_sdk"], version = "~=2.0"}
 uwsgi = ">=2.0"
 uwsgitop = ">=0.11"
 uwsgi-tools = ">=1.1.1"
 
-flask-admin = "==1.6.1"
+
 
 [requires]
-python_version = "3.9"
+python_version = "3.12"